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.
7041658 X packages should not deliver dir actions for mdb directories
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 04 May 2011 14:50:24 -0700
changeset 1120 cc8eb3f69227
parent 1119 51e8e7fa90b7
child 1121 dc6734258624
7041658 X packages should not deliver dir actions for mdb directories
pkg/Makefile file | annotate | diff | comparison | revisions
pkg/exceptions-validate_pkg.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xdmx.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xephyr.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xorg.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xserver-common.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xvfb.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-server-xvnc.p5m file | annotate | diff | comparison | revisions
pkg/transforms/defaults file | annotate | diff | comparison | revisions 
--- a/pkg/Makefile	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/Makefile	Wed May 04 14:50:24 2011 -0700
@@ -140,6 +140,9 @@
 $(PDIR)/%.p5m: legacy/%.p5m
 	$(PKGDEBUG)$(LN) -s ../$< $@
 
+$(PDIR)/%.p5m: %.p5m
+	$(PKGDEBUG)$(LN) -s ../$< $@
+
 PMANIFESTS = $(MANIFESTS:%=$(PDIR)/%)
 manifests: $(PMANIFESTS)
 $(PMANIFESTS): $(PDIR)
@@ -425,7 +428,11 @@
 $(PDIR)/generated-exceptions:
 	$(PKGDEBUG)(cd $(PKGROOT) ; find . -name '*-uninstalled.pc') > $@
 
-protocmp: $(PROC_PKGS) $(EXCEPTIONS) fix_perms
+# Handle exceptions list exceptions-validate_pkg.p5m
+EXCEPTIONS_MOG = $(PDIR)/exceptions-validate_pkg.mog
+$(EXCEPTIONS_MOG):= EXTRA_TRANSFORMS = defaults
+
+protocmp: $(PROC_PKGS) $(EXCEPTIONS) $(EXCEPTIONS_MOG) fix_perms
 	$(PKGDEBUG)validate_pkg -a $(PKGMACH) -v $(EXCEPTIONS:%=-e %) \
 		-m $(PDIR) -p $(PKGROOT)
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkg/exceptions-validate_pkg.p5m	Wed May 04 14:50:24 2011 -0700
@@ -0,0 +1,35 @@
+#
+# Copyright (c) 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.
+#
+
+# This manifest exists solely to provide a list of directories that
+# validate_pkg can match against, since the actions that define them
+# are provided in other consolidations.
+#
+# These can't be included in exception_lists/packaging since that causes
+# all files under these directories to be flagged as errors for being
+# included in packages.
+
+dir path=usr/lib/mdb
+dir path=usr/lib/mdb/proc
+$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
+$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
--- a/pkg/manifests/x11-server-xdmx.p5m	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/manifests/x11-server-xdmx.p5m	Wed May 04 14:50:24 2011 -0700
@@ -26,10 +26,6 @@
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
-dir path=usr/lib/mdb
-dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
--- a/pkg/manifests/x11-server-xephyr.p5m	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/manifests/x11-server-xephyr.p5m	Wed May 04 14:50:24 2011 -0700
@@ -28,12 +28,8 @@
 dir path=usr/X11
 dir path=usr/X11/bin
 dir path=usr/bin
+$(i386_ONLY)dir path=usr/bin/$(ARCH64)
 dir path=usr/lib
-dir path=usr/lib/mdb
-dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/bin/$(ARCH64)
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
--- a/pkg/manifests/x11-server-xorg.p5m	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/manifests/x11-server-xorg.p5m	Wed May 04 14:50:24 2011 -0700
@@ -42,10 +42,6 @@
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/$(ARCH64)/pkgconfig
-dir path=usr/lib/mdb
-dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 dir path=usr/lib/pkgconfig
 dir path=usr/lib/xorg
 dir path=usr/lib/xorg/modules
--- a/pkg/manifests/x11-server-xserver-common.p5m	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/manifests/x11-server-xserver-common.p5m	Wed May 04 14:50:24 2011 -0700
@@ -49,10 +49,6 @@
 dir path=usr/lib/help/profiles
 dir path=usr/lib/help/profiles/locale
 dir path=usr/lib/help/profiles/locale/C
-dir path=usr/lib/mdb
-dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 dir path=usr/lib/xorg
 dir path=usr/share
 dir path=usr/share/man
--- a/pkg/manifests/x11-server-xvfb.p5m	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/manifests/x11-server-xvfb.p5m	Wed May 04 14:50:24 2011 -0700
@@ -29,10 +29,6 @@
 dir path=usr/bin
 $(i386_ONLY)dir path=usr/bin/$(ARCH64)
 dir path=usr/lib
-dir path=usr/lib/mdb
-dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
--- a/pkg/manifests/x11-server-xvnc.p5m	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/manifests/x11-server-xvnc.p5m	Wed May 04 14:50:24 2011 -0700
@@ -33,10 +33,6 @@
 dir path=usr/X11/bin
 dir path=usr/bin
 $(i386_ONLY)dir path=usr/bin/$(ARCH64)
-dir path=usr/lib/mdb
-dir path=usr/lib/mdb/proc
-$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
-$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
--- a/pkg/transforms/defaults	Fri Apr 29 19:31:12 2011 -0700
+++ b/pkg/transforms/defaults	Wed May 04 14:50:24 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# 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"),
@@ -37,7 +37,6 @@
 <transform file path=^lib/svc/manifest/.* -> default group sys>
 <transform dir path=^usr$ -> default group sys>
 <transform dir path=^usr/share$ -> default group sys>
-<transform dir path=^usr/lib/mdb -> default group sys>
 <transform dir path=^usr/lib/pkgconfig$ -> default group other>
 <transform dir path=^usr/lib/$(ARCH64)/pkgconfig$ -> default group other>
 <transform dir path=^usr/share/(aclocal|doc|locale|pixmaps)$ -> \
upstream/oracle/xnv