Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21273362 some 11.3 userland "meta" packages have 5.12 in them s11-update
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Wed, 17 Jun 2015 10:41:50 -0700
branchs11-update
changeset 4495 b5776fb3ca40
parent 4493 aad77f4a709b
child 4496 1a405bbe5189
21273362 some 11.3 userland "meta" packages have 5.12 in them
components/meta-packages/developer-opensolaris-userland/Makefile file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/meta-packages/developer-opensolaris-userland/Makefile	Thu Jun 11 20:52:26 2015 -0700
+++ b/components/meta-packages/developer-opensolaris-userland/Makefile	Wed Jun 17 10:41:50 2015 -0700
@@ -23,6 +23,9 @@
 # Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+# because it hit the 11.3 dev repo this way, we need to keep it at 5.12
+PKG_SOLARIS_VERSION = 5.12
+
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		developer/opensolaris/userland
--- a/make-rules/shared-macros.mk	Thu Jun 11 20:52:26 2015 -0700
+++ b/make-rules/shared-macros.mk	Wed Jun 17 10:41:50 2015 -0700
@@ -96,7 +96,7 @@
 OS_VERSION :=		$(shell uname -r)
 SOLARIS_VERSION =	$(OS_VERSION:5.%=2.%)
 # Target OS version
-PKG_SOLARIS_VERSION ?= 5.12
+PKG_SOLARIS_VERSION ?= 0.5.11
 
 
 include $(WS_MAKE_RULES)/ips-buildinfo.mk
upstream/oracle/userland-gate