Mercurial Mercurial > upstream > oracle > xnv / 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.
7034214 X-redistributable should become X-all and use depend type=group
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 29 Jun 2011 16:04:11 -0700
changeset 1154 941fbafb8c39
parent 1153 912dd58dfc72
child 1155 4ef9f4d0b8de
7034214 X-redistributable should become X-all and use depend type=group
pkg/Makefile file | annotate | diff | comparison | revisions
pkg/X-all.p5m file | annotate | diff | comparison | revisions
pkg/X-redistributable.p5m file | annotate | diff | comparison | revisions
pkg/legacy/X-redistributable.p5m file | annotate | diff | comparison | revisions
pkg/transforms/extract_metadata file | annotate | diff | comparison | revisions 
--- a/pkg/Makefile	Mon Jun 27 13:58:10 2011 -0700
+++ b/pkg/Makefile	Wed Jun 29 16:04:11 2011 -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-redistributable
+SYNTH_PKGS= X-incorporation X-all
 SYNTH_MANIFESTS = $(SYNTH_PKGS:%=%.p5m)
 
 # Manifests are in either manifests or legacy directory - merge in $(PDIR)
@@ -213,7 +213,7 @@
 $(PROC_CURRENT_PKGS) $(PROC_SYNTH_PKGS) := EXTRA_TRANSFORMS = defaults
 
 mogrify: $(PROC_PKGS)
-$(PROC_PKGS): $(PDIR)/versions
+$(PROC_PKGS) $(PROC_SYNTH_PKGS): $(PDIR)/versions
 
 # Combine & uniq metadata & license attributes generated during build
 $(PDIR)/%.attr:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/X-all.p5m	Wed Jun 29 16:04:11 2011 -0700
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2010, 2011, 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.description \
+    value="This group package installs all packages from the X Window System consolidation."
+set name=pkg.summary value="X consolidation group package"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Meta Packages/Group Packages"
--- a/pkg/X-redistributable.p5m	Mon Jun 27 13:58:10 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2010, 2011, 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-redistributable@$(OSPKGVERS)
-set name=pkg.description \
-    value="This group package installs all packages from the X Window System consolidation."
-set name=pkg.summary value="X consolidation group package"
-set name=info.classification \
-    value="org.opensolaris.category.2008:Meta Packages/Group Packages"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/legacy/X-redistributable.p5m	Wed Jun 29 16:04:11 2011 -0700
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2010, 2011, 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.11-0.170
+set name=pkg.renamed value=true
+depend fmri=pkg:/consolidation/X/[email protected],5.11-0.170 type=require
--- a/pkg/transforms/extract_metadata	Mon Jun 27 13:58:10 2011 -0700
+++ b/pkg/transforms/extract_metadata	Wed Jun 29 16:04:11 2011 -0700
@@ -40,10 +40,10 @@
 
 # 
 # Packages that are neither obsolete nor renamed should be included in
-# the X-redistributable group package, unless marked otherwise
+# 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-redistributable: depend fmri=%<1> type=require>
+    pkg:/consolidation/X/X-all: depend fmri=%<1> type=group>
 <transform set name=org.opensolaris.nogroup -> drop>
upstream/oracle/xnv