--- a/BUILD_INSTRUCTIONS Thu Apr 09 23:05:44 2015 -0700
+++ b/BUILD_INSTRUCTIONS Wed Apr 22 13:17:44 2015 -0700
@@ -1,7 +1,7 @@
Solaris X Window System Consolidation Build Instructions
--------------------------------------------------------
-Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -34,11 +34,11 @@
Oracle Solaris Studio C & C++ compilers & associated tools.
These must be found first for cc/CC/etc. in $PATH when you build, and
must include at least these packages (or their equivalents):
- developer/solarisstudio-123/backend
- developer/solarisstudio-123/c++
- developer/solarisstudio-123/cc
- developer/solarisstudio-123/dmake
- developer/solarisstudio-123/library/c++-libs
+ developer/solarisstudio-124/backend
+ developer/solarisstudio-124/c++
+ developer/solarisstudio-124/cc
+ developer/solarisstudio-124/dmake
+ developer/solarisstudio-124/library/c++-libs
There are several options that may be configured when building this software,
such as whether to use tools & servers internal to Oracle's network or not.
@@ -102,9 +102,6 @@
on the system, though it will leave the BE mounted so that you can add
other packages via pkg -R /tmp/onu.* install package-name.
-To install all the packages provided by the X consolidation for the build
-in your BE, you can install the group package pkg:/consolidation/X/X-all .
-
Example: Install to a new BE named "X14" that is cloned from the current BE:
# onu -O -u file://`pwd`/proto/pkgs_i386 -U xnv-devel -t X14
--- a/pkg/Makefile Thu Apr 09 23:05:44 2015 -0700
+++ b/pkg/Makefile Wed Apr 22 13:17:44 2015 -0700
@@ -106,7 +106,7 @@
# build rules and dependencies. The synthetic and real packages use
# different sets of transforms and macros for pkgmogrify.
#
-SYNTH_PKGS= X-incorporation X-all
+SYNTH_PKGS= X-incorporation
SYNTH_MANIFESTS = $(SYNTH_PKGS:%=%.p5m)
# Special manifest for exceptions to pass to pkglint & validate_pkg
--- a/pkg/X-all.p5m Thu Apr 09 23:05:44 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-
-set name=pkg.fmri value=pkg:/consolidation/X/X-all@$(OSPKGVERS)
-set name=pkg.summary value="X consolidation group package"
-set name=pkg.description \
- value="This group package installs all packages from the X Window System consolidation."
-set name=info.classification \
- value="org.opensolaris.category.2008:Meta Packages/Group Packages"
-license cr_Oracle license="Oracle Copyright Notice"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/X-all.p5m Wed Apr 22 13:17:44 2015 -0700
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+set name=pkg.fmri value=pkg:/consolidation/X/[email protected],5.12-5.12.0.0.0.73.0
+set name=pkg.obsolete value=true
--- a/pkg/legacy/X-redistributable.p5m Thu Apr 09 23:05:44 2015 -0700
+++ b/pkg/legacy/X-redistributable.p5m Wed Apr 22 13:17:44 2015 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -21,6 +21,6 @@
# DEALINGS IN THE SOFTWARE.
#
-set name=pkg.fmri value=pkg:/consolidation/X/[email protected],5.11-0.170
-set name=pkg.renamed value=true
-depend type=require fmri=pkg:/consolidation/X/[email protected],5.11-0.170
+set name=pkg.fmri \
+ value=pkg:/consolidation/X/[email protected],5.12-5.12.0.0.0.73.0
+set name=pkg.obsolete value=true
--- a/pkg/transforms/extract_metadata Thu Apr 09 23:05:44 2015 -0700
+++ b/pkg/transforms/extract_metadata Wed Apr 22 13:17:44 2015 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -64,13 +64,3 @@
<transform set name=org.opensolaris.noincorp -> drop>
<transform set name=org.opensolaris.incorporation -> drop>
<transform set name=org.opensolaris.version-lock-facet -> drop>
-
-#
-# Packages that are neither obsolete nor renamed should be included in
-# the X-all group package, unless marked otherwise
-#
-<transform pkg -> default org.opensolaris.nogroup false>
-<transform pkg pkg.renamed=false pkg.obsolete=false \
- org.opensolaris.nogroup=false pkg.fmri=^(.*)@.* -> print \
- pkg:/consolidation/X/X-all: depend type=group fmri=%<1> >
-<transform set name=org.opensolaris.nogroup -> drop>