diff options
| author | Dan Price <dp@eng.sun.com> | 2010-06-12 23:20:18 -0700 |
|---|---|---|
| committer | Dan Price <dp@eng.sun.com> | 2010-06-12 23:20:18 -0700 |
| commit | ebbab6bbae913efeadfa3c6a1b082664a125f95b (patch) | |
| tree | 62a2816d044710beaf491ffa633ff35e41588942 | |
| parent | 5c875b2e2176bacab7c997fa9a41afc5daad1896 (diff) | |
| download | illumos-joyent-ebbab6bbae913efeadfa3c6a1b082664a125f95b.tar.gz | |
6932709 libc mountpoints shouldn't be tagged with preserve=
6948967 opensolaris.zone= persists in ON manifests, should be expunged
6948970 eval in pkg/Makefile masks pkgmogrify failures
6949340 Fix various zones related packaging oddities
6951274 most variant.opensolaris.zone and reboot-needed attributes could be added by rules
6954463 legacy, renamed SUNWiscsitgt and SUNWmms need to be obsoleted properly
6954897 README.pkg should be more helpful describing need for on-extra
800 files changed, 5561 insertions, 6801 deletions
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index b6fa838dcd..e336d36745 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -198,7 +198,7 @@ sparc_ARCH64= sparcv9 # complete reprocessing of all manifests because they'll fail command # dependency checking. # -PM_TRANSFORMS= publish restart_fmri defaults extract_metadata +PM_TRANSFORMS= common_actions publish restart_fmri defaults extract_metadata PM_INC= transforms PKGMOG_DEFINES= \ @@ -512,10 +512,13 @@ $(REPOS:%=$(PKGDEST)/repo.%): # characters. # # - The extract_metadata transforms are designed to spit out shell -# variable assignments to stdout. So the eval statement should -# begin with the default values, and any output from pkgmogrify -# should be in the form of a variable assignment to override those -# defaults. +# variable assignments to stdout. Those are published to the +# .vars temporary files, and then used as input to the eval +# statement. This is done in stages specifically so that pkgmogrify +# can signal failure if the manifest has a syntactic or other error. +# The eval statement should begin with the default values, and the +# output from pkgmogrify (if any) should be in the form of a +# variable assignment to override those defaults. # # - When this rule completes execution, it must leave an updated # target file ($@) in place, or make will reprocess the package @@ -534,11 +537,12 @@ $(REPOS:%=$(PKGDEST)/repo.%): $(PDIR)/%.mog: manifests/%.mf @print "Processing manifest $(<F)" $(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \ - $(PDIR)/$(@F:%.mog=%).metadata.* - $(PKGDEBUG)eval REPO=redist PKGSTAT=current \ - NODEPEND=$(SUPPRESSPKGDEP) \ - `$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \ - $(PKGMOG_DEFINES:%=-D %) -O $(@) $(<) $(PM_TRANSFORMS)`; \ + $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars + $(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \ + $(PKGMOG_DEFINES:%=-D %) -P $(@).vars -O $(@) \ + $(<) $(PM_TRANSFORMS) + $(PKGDEBUG)eval REPO=redist PKGSTAT=current NODEPEND=$(SUPPRESSPKGDEP) \ + `$(CAT) -s $(@).vars`; \ if [ -f $(@) ]; then \ if [ "$$NODEPEND" != "false" ]; then \ $(TOUCH) $(@:%.mog=%.nodepend); \ @@ -552,6 +556,7 @@ $(PDIR)/%.mog: manifests/%.mf else \ $(TOUCH) $(@); \ fi + $(PKGDEBUG)$(RM) $(@).vars $(PDIR)/%.dep: $(PDIR)/%.mog @print "Generating dependencies for $(<F)" @@ -595,17 +600,19 @@ $(PDIR)/%.pub: $(PDIR)/%.res # $(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.mf) @print "Processing synthetic manifest $(@F:%.mog=%.mf)" - $(PKGDEBUG)$(RM) $(@) $(PDIR)/$(@F:%.mog=%).metadata.* - $(PKGDEBUG)eval REPO=redist PKGSTAT=current \ - `$(PKGMOGRIFY) $(PKGMOG_VERBOSE) -I transforms -I $(PDIR) \ + $(PKGDEBUG)$(RM) $(@) $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars + $(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) -I transforms -I $(PDIR) \ $(PKGMOG_DEFINES:%=-D %) -D PKGDEP_TYPE=$(PKGDEP_TYPE) \ - -O $(@) $(@F:%.mog=%.mf) $(PM_TRANSFORMS) synthetic` ; \ + -P $(@).vars -O $(@) $(@F:%.mog=%.mf) \ + $(PM_TRANSFORMS) synthetic + $(PKGDEBUG)eval REPO=redist PKGSTAT=current `$(CAT) -s $(@).vars`; \ if [ -f $(@) ]; then \ $(LN) -s $(@F) \ $(PDIR)/$(@F:%.mog=%).metadata.$$PKGSTAT.$$REPO; \ else \ $(TOUCH) $(@); \ fi + $(PKGDEBUG)$(RM) $(@).vars $(DEP_SYNTH_PKGS): $$(@:%.dep=%.mog) @print "Skipping dependency generation for $(@F:%.dep=%)" diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg index 22827a4b17..71179cc0ab 100644 --- a/usr/src/pkg/README.pkg +++ b/usr/src/pkg/README.pkg @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Introduction @@ -57,7 +56,7 @@ for DEBUG and non-DEBUG, and are thus available at non-redistributable (without a proper legal agreement) pieces which may or may not be suitable for inclusion in the pkg.sun.com/opensolaris/extra repository, including the - SUNWcryptoint bits necessary for working crypto in a Closed + internal crypto bits necessary for working crypto in a Closed build. Do not distribute any of the bits in repo.extra without prior agreement from the appropriate lawyers. @@ -96,11 +95,17 @@ The build behavior may modified by the following variables: ON_CRYPTO_BINS or CODESIGN_USER If ON_CRYPTO_BINS or CODESIGN_USER is set in your build env, no packages will depend on the internal crypto certificates. + If neither is set, your bits depend on the internal crypto certificates being available and packages will depend on pkg:/driver/crypto/dprov, which is only available in the on-extra repository. + *** Important *** This means that, if you build using + internal crypto, but you try to do an image-update with + only repo.redist, you will be told that there are no + updates available. + SUPPRESSPKGDEP If SUPPRESSPKGDEP is set to "true" in your environment, package dependencies will not be generated. This variable @@ -190,11 +195,20 @@ serve the generated repositories to multiple test machines. The depot can be started across NFS as well if you have a fast pipe. + If you used internal crypto in your builds, then you must + do this step for both repo.redist and repo.extra, picking + different ports for each. Otherwise, you will be unable to + image-update. + Configure your test system. pkg set-publisher -P -g http://<your server host>:<port> on-nightly pkg set-publisher --non-sticky opensolaris.org pkg uninstall entire + If you used internal crypto in your builds, then you must also: + pkg set-publisher -P \ + -g http://<your server host>:<extra-port> on-extra + pkg image-update your test system. pkg image-update will upgrade all packages on your test system @@ -218,6 +232,13 @@ There are various tactics for troubleshooting a failed upgrade. pkg search -l ::pkg.renamed:true pkg search -l ::pkg.obsolete:true + Check to see if you used internal crypto, but failed to provide + a server for repo.extra. + Use a web browser to view the system/kernel manifest from + your on-nightly publisher and look for a dependency on the + driver/crypto/dprov package. + + Making Packaging Changes ------------------------ @@ -382,21 +403,65 @@ You should also test install yourself. You can do this by replacing the "slim_install" in your Distro Constructor manifest with the explicit list of packages to install. -To remove a package, you must mark it as obsolete. The obsoleted -package manifest should include +To remove a package, you must mark it as obsolete. You must *also* mark +as obsolete any packages which are renamed ancestors of this package, and +remove their rename dependencies. Here is what you must do. - set name=pkg.fmri with the version set explicitly to the +To find rename ancestors, select all of the manifests which are renames, +then look for the one which was renamed to the package you care about. +For example, to find rename ancestors of 'system/zones', do the following: + + $ cd usr/src/pkg/manifests + $ mypkgname=system/zones + $ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.mf` /dev/null + SUNWzone.mf + +Make sure to check that the package has not undergone multiple renames! + + $ mypkgname=SUNWzone + $ grep -l "fmri=pkg:/$mypkgname@" `grep -l pkg.renamed *.mf` /dev/null + $ + +Once you have the renamed ancestor list, for *each* of the packages (the +newly obsolete package, and its renamed ancestors), edit the package as +follows: + + Update 'set name=pkg.fmri' with the version set explicitly to the build you're integrating into. For example, if you wanted to remove SUNWwbsd in build 133 you'd change the pkg.fmri - line to read - set name=pkg.fmri value=pkg:/SUNWwbsd@0.5.11,5.11-0.133 + line to read: + 'set name=pkg.fmri value=pkg:/SUNWwbsd@0.5.11,5.11-0.133' - set name=pkg.obsolete value=true + Add 'set name=pkg.obsolete value=true'. - The architectures and variants you're obsoleting. These - should just be copied from your old package, as you - must obsolete a package on all architectures and - variants simultaneously. + Maintain the architecture and variant declarations in the + package you are obsoleting. Note that you must obsolete a + package on all architectures and variants simultaneously. + + Maintain 'set name=org.opensolaris.redist' actions if present. + + Delete everything else. + + If the package is a renamed ancestor, leave a comment behind as + follows: + + # Was renamed to <other-pkg-name>, both now obsolete. + +Here is a complete example. SUNWfoobar was a package which was renamed +to system/foobar in build 140, and then later obsoleted in build 150. +Note that in all cases the package FMRI is updated to the obsoletion +build, 150. + + SUNWfoobar.mf: + # Was renamed to system/foobar, both now obsolete. + set name=pkg.fmri value=pkg:/SUNWfoobar@0.5.11,5.11-0.150 + set name=pkg.obsolete value=true + set name=variant.arch value=$(ARCH) + + system-foobar.mf: + set name=pkg.fmri value=pkg:/system/foobar@0.5.11,5.11-0.150 + set name=pkg.obsolete value=true + set name=variant.arch value=$(ARCH) Creating a Package ------------------ @@ -420,10 +485,6 @@ The following actions are required for all packages in ON. set name=variant.arch Every package must specify which architectures it delivers. - set name=variant.opensolaris.zone - Every package must specify whether it can be installed in - global zones, non-global zones, or both. - set name=info.classification Every package must specify a category for the packaging GUI. You must use an existing category, and may not invent new ones. @@ -446,6 +507,17 @@ The following actions are uncommon but specific to ON. content to a package with this action, you should have modified bindrop.sh, and test open-only builds. +You don't need to set the following. They're taken care of for all OS/Net +packages in the transforms/common_actions file. + + set name=variant.opensolaris.zone + Every package must specify whether it can be installed in + global zones, non-global zones, or both. All ON packages are + delivered in both global and non-global zones. + + set name=org.opensolaris.consolidation value=osnet + All packages from OS/Net come from OS/Net... + Drivers and Packages -------------------- diff --git a/usr/src/pkg/manifests/BRCMbnx.mf b/usr/src/pkg/manifests/BRCMbnx.mf index ad97637e74..1eeceb4afe 100644 --- a/usr/src/pkg/manifests/BRCMbnx.mf +++ b/usr/src/pkg/manifests/BRCMbnx.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/BRCMbnx@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/bnx@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/BRCMbnxe.mf b/usr/src/pkg/manifests/BRCMbnxe.mf index 875e0e34b8..b167290ede 100644 --- a/usr/src/pkg/manifests/BRCMbnxe.mf +++ b/usr/src/pkg/manifests/BRCMbnxe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/BRCMbnxe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/bnxe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/CPQary3.mf b/usr/src/pkg/manifests/CPQary3.mf index 21949c0c64..9c8f2429d6 100644 --- a/usr/src/pkg/manifests/CPQary3.mf +++ b/usr/src/pkg/manifests/CPQary3.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/CPQary3@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/cpqary3@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNW0on.mf b/usr/src/pkg/manifests/SUNW0on.mf index 38f72f57e6..7817d9e9ac 100644 --- a/usr/src/pkg/manifests/SUNW0on.mf +++ b/usr/src/pkg/manifests/SUNW0on.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNW0on@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/consolidation/osnet/osnet-message-files@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNW1394.mf b/usr/src/pkg/manifests/SUNW1394.mf index 5825c3bb62..2c5c8d16fd 100644 --- a/usr/src/pkg/manifests/SUNW1394.mf +++ b/usr/src/pkg/manifests/SUNW1394.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNW1394@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/firewire@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNW1394h.mf b/usr/src/pkg/manifests/SUNW1394h.mf index a9265d3827..05cc323cc5 100644 --- a/usr/src/pkg/manifests/SUNW1394h.mf +++ b/usr/src/pkg/manifests/SUNW1394h.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNW1394h@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-firewire@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaac.mf b/usr/src/pkg/manifests/SUNWaac.mf index a8cf6fb5a1..32cf6a244f 100644 --- a/usr/src/pkg/manifests/SUNWaac.mf +++ b/usr/src/pkg/manifests/SUNWaac.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaac@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/aac@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWacc.mf b/usr/src/pkg/manifests/SUNWacc.mf index 1cbecf22e2..e68f3f2453 100644 --- a/usr/src/pkg/manifests/SUNWacc.mf +++ b/usr/src/pkg/manifests/SUNWacc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWacc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/accounting/legacy@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWad810.mf b/usr/src/pkg/manifests/SUNWad810.mf index 9de93691a5..882630738e 100644 --- a/usr/src/pkg/manifests/SUNWad810.mf +++ b/usr/src/pkg/manifests/SUNWad810.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWad810@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audio810@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWadixp.mf b/usr/src/pkg/manifests/SUNWadixp.mf index 9aad184738..7a4b783781 100644 --- a/usr/src/pkg/manifests/SUNWadixp.mf +++ b/usr/src/pkg/manifests/SUNWadixp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWadixp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audioixp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWadpu320.mf b/usr/src/pkg/manifests/SUNWadpu320.mf index 03b133cb95..33d87e4a23 100644 --- a/usr/src/pkg/manifests/SUNWadpu320.mf +++ b/usr/src/pkg/manifests/SUNWadpu320.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWadpu320@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/adpu320@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWafe.mf b/usr/src/pkg/manifests/SUNWafe.mf index 978f85475d..a8ba80e90d 100644 --- a/usr/src/pkg/manifests/SUNWafe.mf +++ b/usr/src/pkg/manifests/SUNWafe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWafe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/afe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWagp.mf b/usr/src/pkg/manifests/SUNWagp.mf index 4221dc9456..5b479a0a16 100644 --- a/usr/src/pkg/manifests/SUNWagp.mf +++ b/usr/src/pkg/manifests/SUNWagp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWagp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/agpgart@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWagph.mf b/usr/src/pkg/manifests/SUNWagph.mf index be3308beb6..a0914614e7 100644 --- a/usr/src/pkg/manifests/SUNWagph.mf +++ b/usr/src/pkg/manifests/SUNWagph.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWagph@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-agp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWahci.mf b/usr/src/pkg/manifests/SUNWahci.mf index ba2a99be92..9635ef8172 100644 --- a/usr/src/pkg/manifests/SUNWahci.mf +++ b/usr/src/pkg/manifests/SUNWahci.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWahci@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/ahci@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWamd8111s.mf b/usr/src/pkg/manifests/SUNWamd8111s.mf index 73d36f08fc..372916741b 100644 --- a/usr/src/pkg/manifests/SUNWamd8111s.mf +++ b/usr/src/pkg/manifests/SUNWamd8111s.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWamd8111s@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/amd8111s@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWamr.mf b/usr/src/pkg/manifests/SUNWamr.mf index a1d424c93e..92b0847a4f 100644 --- a/usr/src/pkg/manifests/SUNWamr.mf +++ b/usr/src/pkg/manifests/SUNWamr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWamr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/amr@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWamt.mf b/usr/src/pkg/manifests/SUNWamt.mf index 6c6814b8bc..95db728356 100644 --- a/usr/src/pkg/manifests/SUNWamt.mf +++ b/usr/src/pkg/manifests/SUNWamt.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWamt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/management/intel-amt@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWapct.mf b/usr/src/pkg/manifests/SUNWapct.mf index 9d63362908..941bd7f0e3 100644 --- a/usr/src/pkg/manifests/SUNWapct.mf +++ b/usr/src/pkg/manifests/SUNWapct.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWapct@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/appcert@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWarbel.mf b/usr/src/pkg/manifests/SUNWarbel.mf index 041f484232..f28062f9e5 100644 --- a/usr/src/pkg/manifests/SUNWarbel.mf +++ b/usr/src/pkg/manifests/SUNWarbel.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWarbel@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/arbel@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWarc.mf b/usr/src/pkg/manifests/SUNWarc.mf index 731813da39..1c18e8e3e9 100644 --- a/usr/src/pkg/manifests/SUNWarc.mf +++ b/usr/src/pkg/manifests/SUNWarc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWarc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/library/lint@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWarcmsr.mf b/usr/src/pkg/manifests/SUNWarcmsr.mf index 767f85c296..64dd4819e9 100644 --- a/usr/src/pkg/manifests/SUNWarcmsr.mf +++ b/usr/src/pkg/manifests/SUNWarcmsr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWarcmsr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/arcmsr@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWarn.mf b/usr/src/pkg/manifests/SUNWarn.mf index 3811a4af7b..8b120c2037 100644 --- a/usr/src/pkg/manifests/SUNWarn.mf +++ b/usr/src/pkg/manifests/SUNWarn.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWarn@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/arn@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWastdev.mf b/usr/src/pkg/manifests/SUNWastdev.mf index 2a9ffb1e21..49e38554b3 100644 --- a/usr/src/pkg/manifests/SUNWastdev.mf +++ b/usr/src/pkg/manifests/SUNWastdev.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWastdev@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/astdev@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWatfs.mf b/usr/src/pkg/manifests/SUNWatfs.mf index 59d7aa50fa..ab056dcfa8 100644 --- a/usr/src/pkg/manifests/SUNWatfs.mf +++ b/usr/src/pkg/manifests/SUNWatfs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWatfs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/autofs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWatge.mf b/usr/src/pkg/manifests/SUNWatge.mf index a624df738c..4e54aafd98 100644 --- a/usr/src/pkg/manifests/SUNWatge.mf +++ b/usr/src/pkg/manifests/SUNWatge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWatge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/atge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWatheros.mf b/usr/src/pkg/manifests/SUNWatheros.mf index 1886cdd31d..3acfb989b8 100644 --- a/usr/src/pkg/manifests/SUNWatheros.mf +++ b/usr/src/pkg/manifests/SUNWatheros.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWatheros@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ath@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWatigfx.mf b/usr/src/pkg/manifests/SUNWatigfx.mf index de110f104a..a54e1031e2 100644 --- a/usr/src/pkg/manifests/SUNWatigfx.mf +++ b/usr/src/pkg/manifests/SUNWatigfx.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWatigfx@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/atiatom@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWatu.mf b/usr/src/pkg/manifests/SUNWatu.mf index 7264668e22..30b7700d1f 100644 --- a/usr/src/pkg/manifests/SUNWatu.mf +++ b/usr/src/pkg/manifests/SUNWatu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWatu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/atu@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWauda.mf b/usr/src/pkg/manifests/SUNWauda.mf index c83ebc4cfc..b73e3c848b 100644 --- a/usr/src/pkg/manifests/SUNWauda.mf +++ b/usr/src/pkg/manifests/SUNWauda.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWauda@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/audio/audio-utilities@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudd.mf b/usr/src/pkg/manifests/SUNWaudd.mf index f63c343eaa..9c679b9212 100644 --- a/usr/src/pkg/manifests/SUNWaudd.mf +++ b/usr/src/pkg/manifests/SUNWaudd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudf.mf b/usr/src/pkg/manifests/SUNWaudf.mf index 9841a3289d..aad5543ace 100644 --- a/usr/src/pkg/manifests/SUNWaudf.mf +++ b/usr/src/pkg/manifests/SUNWaudf.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudf@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/library/demo/audio-samples@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudh.mf b/usr/src/pkg/manifests/SUNWaudh.mf index 9a3ad95f8b..e022c1e7ba 100644 --- a/usr/src/pkg/manifests/SUNWaudh.mf +++ b/usr/src/pkg/manifests/SUNWaudh.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-audio@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudiocmi.mf b/usr/src/pkg/manifests/SUNWaudiocmi.mf index ab3b720b7e..1ea31361c7 100644 --- a/usr/src/pkg/manifests/SUNWaudiocmi.mf +++ b/usr/src/pkg/manifests/SUNWaudiocmi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudiocmi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiocmi@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudioemu10k.mf b/usr/src/pkg/manifests/SUNWaudioemu10k.mf index 5a35eea248..e99775d4fb 100644 --- a/usr/src/pkg/manifests/SUNWaudioemu10k.mf +++ b/usr/src/pkg/manifests/SUNWaudioemu10k.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudioemu10k@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audioemu10k@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudiohd.mf b/usr/src/pkg/manifests/SUNWaudiohd.mf index 24d0ef8b35..910d6eb0df 100644 --- a/usr/src/pkg/manifests/SUNWaudiohd.mf +++ b/usr/src/pkg/manifests/SUNWaudiohd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudiohd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiohd@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudiols.mf b/usr/src/pkg/manifests/SUNWaudiols.mf index fec6c12f4e..8ead18a657 100644 --- a/usr/src/pkg/manifests/SUNWaudiols.mf +++ b/usr/src/pkg/manifests/SUNWaudiols.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudiols@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiols@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudiop16x.mf b/usr/src/pkg/manifests/SUNWaudiop16x.mf index e81f41f2a3..7dd9f1f040 100644 --- a/usr/src/pkg/manifests/SUNWaudiop16x.mf +++ b/usr/src/pkg/manifests/SUNWaudiop16x.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudiop16x@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiop16x@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudiosolo.mf b/usr/src/pkg/manifests/SUNWaudiosolo.mf index c0cb3d8358..336c353ce1 100644 --- a/usr/src/pkg/manifests/SUNWaudiosolo.mf +++ b/usr/src/pkg/manifests/SUNWaudiosolo.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudiosolo@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiosolo@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudiovia97.mf b/usr/src/pkg/manifests/SUNWaudiovia97.mf index 6a60e06b5c..9fc9677b05 100644 --- a/usr/src/pkg/manifests/SUNWaudiovia97.mf +++ b/usr/src/pkg/manifests/SUNWaudiovia97.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudiovia97@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiovia97@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWaudit.mf b/usr/src/pkg/manifests/SUNWaudit.mf index cbe7f46389..9d264607f1 100644 --- a/usr/src/pkg/manifests/SUNWaudit.mf +++ b/usr/src/pkg/manifests/SUNWaudit.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWaudit@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/library/libadt_jni@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWav1394.mf b/usr/src/pkg/manifests/SUNWav1394.mf index 6d2704896d..5b13c1c42c 100644 --- a/usr/src/pkg/manifests/SUNWav1394.mf +++ b/usr/src/pkg/manifests/SUNWav1394.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWav1394@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/av1394@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbart.mf b/usr/src/pkg/manifests/SUNWbart.mf index c0b03d1d9b..b26aa1b425 100644 --- a/usr/src/pkg/manifests/SUNWbart.mf +++ b/usr/src/pkg/manifests/SUNWbart.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbart@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/security/bart@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbcmsata.mf b/usr/src/pkg/manifests/SUNWbcmsata.mf index 6d14b5053e..343b5e1551 100644 --- a/usr/src/pkg/manifests/SUNWbcmsata.mf +++ b/usr/src/pkg/manifests/SUNWbcmsata.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbcmsata@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/bcm_sata@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbcp.mf b/usr/src/pkg/manifests/SUNWbcp.mf index c87ccaa415..eb4edb9456 100644 --- a/usr/src/pkg/manifests/SUNWbcp.mf +++ b/usr/src/pkg/manifests/SUNWbcp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbcp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/compatibility/sunos4@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbfe.mf b/usr/src/pkg/manifests/SUNWbfe.mf index 0c6e3707fb..120ed715be 100644 --- a/usr/src/pkg/manifests/SUNWbfe.mf +++ b/usr/src/pkg/manifests/SUNWbfe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbfe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/bfe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbge.mf b/usr/src/pkg/manifests/SUNWbge.mf index 10553c6faa..513422a7ca 100644 --- a/usr/src/pkg/manifests/SUNWbge.mf +++ b/usr/src/pkg/manifests/SUNWbge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/bge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbip.mf b/usr/src/pkg/manifests/SUNWbip.mf index 1f58b4a731..0f2cf180c0 100644 --- a/usr/src/pkg/manifests/SUNWbip.mf +++ b/usr/src/pkg/manifests/SUNWbip.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbip@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/ftp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbmc.mf b/usr/src/pkg/manifests/SUNWbmc.mf index d9673ed604..5a4c1982a9 100644 --- a/usr/src/pkg/manifests/SUNWbmc.mf +++ b/usr/src/pkg/manifests/SUNWbmc.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbmc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/management/bmc@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbnu.mf b/usr/src/pkg/manifests/SUNWbnu.mf index 6069c41677..f4b8fac550 100644 --- a/usr/src/pkg/manifests/SUNWbnu.mf +++ b/usr/src/pkg/manifests/SUNWbnu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbnu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/uucp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbridge.mf b/usr/src/pkg/manifests/SUNWbridge.mf index 1c68ce901b..e9d11b1bee 100644 --- a/usr/src/pkg/manifests/SUNWbridge.mf +++ b/usr/src/pkg/manifests/SUNWbridge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbridge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/bridging@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbs.mf b/usr/src/pkg/manifests/SUNWbs.mf index e24084b8aa..c16a0daf33 100644 --- a/usr/src/pkg/manifests/SUNWbs.mf +++ b/usr/src/pkg/manifests/SUNWbs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/boot/network@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWbtool.mf b/usr/src/pkg/manifests/SUNWbtool.mf index 85378e34ed..4f3b3353ac 100644 --- a/usr/src/pkg/manifests/SUNWbtool.mf +++ b/usr/src/pkg/manifests/SUNWbtool.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWbtool@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/object-file@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcakr.mf b/usr/src/pkg/manifests/SUNWcakr.mf index e3ee729b4b..4890ee041a 100644 --- a/usr/src/pkg/manifests/SUNWcakr.mf +++ b/usr/src/pkg/manifests/SUNWcakr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcakr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/platform@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcakrx.mf b/usr/src/pkg/manifests/SUNWcakrx.mf index 25ed236e1a..e02cc17255 100644 --- a/usr/src/pkg/manifests/SUNWcakrx.mf +++ b/usr/src/pkg/manifests/SUNWcakrx.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcakrx@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWcakr type=require diff --git a/usr/src/pkg/manifests/SUNWcar.mf b/usr/src/pkg/manifests/SUNWcar.mf index 5a9b3431b6..3378dc8d89 100644 --- a/usr/src/pkg/manifests/SUNWcar.mf +++ b/usr/src/pkg/manifests/SUNWcar.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcar@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/processor@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcarx.mf b/usr/src/pkg/manifests/SUNWcarx.mf index 1ee451900d..fe392709bd 100644 --- a/usr/src/pkg/manifests/SUNWcarx.mf +++ b/usr/src/pkg/manifests/SUNWcarx.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcarx@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWcar type=require diff --git a/usr/src/pkg/manifests/SUNWcdrw.mf b/usr/src/pkg/manifests/SUNWcdrw.mf index 555710bc69..1f524a110b 100644 --- a/usr/src/pkg/manifests/SUNWcdrw.mf +++ b/usr/src/pkg/manifests/SUNWcdrw.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcdrw@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/media/cdrw@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcfcl.mf b/usr/src/pkg/manifests/SUNWcfcl.mf index 9f7d7c36c2..f8522f2fb2 100644 --- a/usr/src/pkg/manifests/SUNWcfcl.mf +++ b/usr/src/pkg/manifests/SUNWcfcl.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcfcl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/storage/fibre-channel/hbaapi@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWcfpl.mf b/usr/src/pkg/manifests/SUNWcfpl.mf index f58fee4695..450da56e97 100644 --- a/usr/src/pkg/manifests/SUNWcfpl.mf +++ b/usr/src/pkg/manifests/SUNWcfpl.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcfpl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/storage/fibre-channel/fc-fabric@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWcg6.mf b/usr/src/pkg/manifests/SUNWcg6.mf index bd8a42e9d8..24f883a3b5 100644 --- a/usr/src/pkg/manifests/SUNWcg6.mf +++ b/usr/src/pkg/manifests/SUNWcg6.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcg6@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWcg6h.mf b/usr/src/pkg/manifests/SUNWcg6h.mf index a7157824c8..0eace2fc93 100644 --- a/usr/src/pkg/manifests/SUNWcg6h.mf +++ b/usr/src/pkg/manifests/SUNWcg6h.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcg6h@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWchxge.mf b/usr/src/pkg/manifests/SUNWchxge.mf index 1ac3695e69..16150e712d 100644 --- a/usr/src/pkg/manifests/SUNWchxge.mf +++ b/usr/src/pkg/manifests/SUNWchxge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWchxge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/chxge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWckr.mf b/usr/src/pkg/manifests/SUNWckr.mf index b04f38afd7..2d9286a6e8 100644 --- a/usr/src/pkg/manifests/SUNWckr.mf +++ b/usr/src/pkg/manifests/SUNWckr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWckr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcnetr.mf b/usr/src/pkg/manifests/SUNWcnetr.mf index 137fb97660..a7b20101c8 100644 --- a/usr/src/pkg/manifests/SUNWcnetr.mf +++ b/usr/src/pkg/manifests/SUNWcnetr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcnetr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcns.mf b/usr/src/pkg/manifests/SUNWcns.mf index bc7d145e7c..d164989434 100644 --- a/usr/src/pkg/manifests/SUNWcns.mf +++ b/usr/src/pkg/manifests/SUNWcns.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcns@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/legacy@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcpc.mf b/usr/src/pkg/manifests/SUNWcpc.mf index 926841c8fc..342336a517 100644 --- a/usr/src/pkg/manifests/SUNWcpc.mf +++ b/usr/src/pkg/manifests/SUNWcpc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcpc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/cpu-counters@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcpcu.mf b/usr/src/pkg/manifests/SUNWcpcu.mf index e9180a1785..a1aa14f159 100644 --- a/usr/src/pkg/manifests/SUNWcpcu.mf +++ b/usr/src/pkg/manifests/SUNWcpcu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcpcu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/diagnostic/cpu-counters@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcpr.mf b/usr/src/pkg/manifests/SUNWcpr.mf index 69cb72ce0e..5d9cb3c7dc 100644 --- a/usr/src/pkg/manifests/SUNWcpr.mf +++ b/usr/src/pkg/manifests/SUNWcpr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcpr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/suspend-resume@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcryptoint.mf b/usr/src/pkg/manifests/SUNWcryptoint.mf index d3b25e1994..ba62dbba86 100644 --- a/usr/src/pkg/manifests/SUNWcryptoint.mf +++ b/usr/src/pkg/manifests/SUNWcryptoint.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcryptoint@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=internal set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/crypto/dprov@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf index 7ee8fddb6a..6a92f9b5d8 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -27,7 +27,6 @@ set name=pkg.description \ set name=pkg.summary value="Core Solaris" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=dev group=sys dir path=etc group=sys dir path=etc/certs group=sys @@ -87,10 +86,6 @@ dir path=lib/inet dir path=lib/svc dir path=lib/svc/bin dir path=lib/svc/capture -dir path=lib/svc/method -dir path=lib/svc/monitor -dir path=lib/svc/seed -dir path=lib/svc/share dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/application group=sys dir path=lib/svc/manifest/application/management group=sys @@ -113,6 +108,10 @@ dir path=lib/svc/manifest/system/device group=sys dir path=lib/svc/manifest/system/filesystem group=sys dir path=lib/svc/manifest/system/security group=sys dir path=lib/svc/manifest/system/svc group=sys +dir path=lib/svc/method +dir path=lib/svc/monitor +dir path=lib/svc/seed +dir path=lib/svc/share dir path=mnt group=sys dir path=opt group=sys dir path=proc group=root mode=0555 @@ -320,20 +319,20 @@ dir path=var/svc/manifest/network/ipsec group=sys dir path=var/svc/manifest/network/ldap group=sys dir path=var/svc/manifest/network/nfs group=sys dir path=var/svc/manifest/network/nis group=sys -dir path=var/svc/manifest/network/rpc group=sys dir path=var/svc/manifest/network/routing group=sys +dir path=var/svc/manifest/network/rpc group=sys dir path=var/svc/manifest/network/security group=sys dir path=var/svc/manifest/network/shares group=sys dir path=var/svc/manifest/network/ssl group=sys dir path=var/svc/manifest/platform group=sys $(sparc_ONLY)dir path=var/svc/manifest/platform/sun4u group=sys $(sparc_ONLY)dir path=var/svc/manifest/platform/sun4v group=sys +dir path=var/svc/manifest/site group=sys dir path=var/svc/manifest/system group=sys dir path=var/svc/manifest/system/device group=sys dir path=var/svc/manifest/system/filesystem group=sys dir path=var/svc/manifest/system/security group=sys dir path=var/svc/manifest/system/svc group=sys -dir path=var/svc/manifest/site group=sys dir path=var/svc/profile group=sys dir path=var/tmp group=sys mode=1777 driver name=dump perms="dump 0660 root sys" @@ -474,6 +473,31 @@ file path=etc/skel/.profile group=other preserve=true file path=etc/skel/local.cshrc group=sys preserve=true file path=etc/skel/local.login group=sys preserve=true file path=etc/skel/local.profile group=sys preserve=true +file path=etc/svc/profile/generic_limited_net.xml group=sys mode=0444 +file path=etc/svc/profile/generic_open.xml group=sys mode=0444 +file path=etc/svc/profile/inetd_generic.xml group=sys mode=0444 +file path=etc/svc/profile/inetd_upgrade.xml group=sys mode=0444 +file path=etc/svc/profile/ns_dns.xml group=sys mode=0444 +file path=etc/svc/profile/ns_files.xml group=sys mode=0444 +file path=etc/svc/profile/ns_ldap.xml group=sys mode=0444 +file path=etc/svc/profile/ns_nis.xml group=sys mode=0444 +file path=etc/svc/profile/ns_none.xml group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,SPARC-Enterprise.xml \ + group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-15000.xml \ + group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-880.xml \ + group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire.xml group=sys \ + mode=0444 +$(sparc_ONLY)file \ + path=etc/svc/profile/platform_SUNW,Ultra-Enterprise-10000.xml group=sys \ + mode=0444 +$(sparc_ONLY)file \ + path=etc/svc/profile/platform_SUNW,UltraSPARC-IIi-Netract.xml group=sys \ + mode=0444 +file path=etc/svc/profile/platform_none.xml group=sys mode=0444 +$(sparc_ONLY)file path=etc/svc/profile/platform_sun4v.xml group=sys mode=0444 file path=etc/sysevent/config/README group=sys mode=0444 file path=etc/sysevent/config/SUNW,EC_dr,ESC_dr_req,sysevent.conf group=sys file path=etc/syslog.conf group=sys preserve=true @@ -494,6 +518,77 @@ file path=lib/svc/bin/sqlite group=sys mode=0555 file path=lib/svc/bin/svc.configd group=sys mode=0555 file path=lib/svc/bin/svc.ipfd group=sys mode=0555 file path=lib/svc/bin/svc.startd group=sys mode=0555 +file path=lib/svc/manifest/milestone/multi-user-server.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/multi-user.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/name-services.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/network.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/single-user.xml group=sys mode=0444 +file path=lib/svc/manifest/milestone/sysconfig.xml group=sys mode=0444 +file path=lib/svc/manifest/network/dlmgmt.xml group=sys mode=0444 +file path=lib/svc/manifest/network/dns/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/forwarding.xml group=sys mode=0444 +file path=lib/svc/manifest/network/inetd-upgrade.xml group=sys mode=0444 +file path=lib/svc/manifest/network/inetd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/ike.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/ipsecalgs.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/manual-key.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ipsec/policy.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ldap/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-initial.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-ipmgmt.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-ipqos.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-iptun.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-location.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-loopback.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-netcfg.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-netmask.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-physical.xml group=sys mode=0444 +file path=lib/svc/manifest/network/network-routing-setup.xml group=sys \ + mode=0444 +file path=lib/svc/manifest/network/network-service.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/legacy-routing.xml group=sys \ + mode=0444 +file path=lib/svc/manifest/network/rpc/bind.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/keyserv.xml group=sys mode=0444 +file path=lib/svc/manifest/network/shares/group.xml group=sys mode=0444 +file path=lib/svc/manifest/network/shares/reparsed.xml group=sys mode=0444 +file path=lib/svc/manifest/network/ssl/kssl-proxy.xml group=sys mode=0444 +file path=lib/svc/manifest/system/auditd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/boot-archive-update.xml group=sys mode=0444 +file path=lib/svc/manifest/system/boot-archive.xml group=sys mode=0444 +file path=lib/svc/manifest/system/boot-config.xml group=sys mode=0444 +file path=lib/svc/manifest/system/consadm.xml group=sys mode=0444 +file path=lib/svc/manifest/system/console-login.xml group=sys mode=0444 +file path=lib/svc/manifest/system/coreadm.xml group=sys mode=0444 +file path=lib/svc/manifest/system/cron.xml group=sys mode=0444 +file path=lib/svc/manifest/system/cryptosvc.xml group=sys mode=0444 +file path=lib/svc/manifest/system/device/devices-audio.xml group=sys mode=0444 +file path=lib/svc/manifest/system/device/devices-local.xml group=sys mode=0444 +file path=lib/svc/manifest/system/device/mpxio-upgrade.xml group=sys mode=0444 +file path=lib/svc/manifest/system/early-manifest-import.xml group=sys \ + mode=0444 +file path=lib/svc/manifest/system/extended-accounting.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/local-fs.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/minimal-fs.xml group=sys \ + mode=0444 +file path=lib/svc/manifest/system/filesystem/root-fs.xml group=sys mode=0444 +file path=lib/svc/manifest/system/filesystem/usr-fs.xml group=sys mode=0444 +$(i386_ONLY)file path=lib/svc/manifest/system/hostid.xml group=sys mode=0444 +file path=lib/svc/manifest/system/hotplug.xml group=sys mode=0444 +file path=lib/svc/manifest/system/identity.xml group=sys mode=0444 +file path=lib/svc/manifest/system/idmap.xml group=sys mode=0444 +file path=lib/svc/manifest/system/keymap.xml group=sys mode=0444 +file path=lib/svc/manifest/system/manifest-import.xml group=sys mode=0444 +file path=lib/svc/manifest/system/name-service-cache.xml group=sys mode=0444 +file path=lib/svc/manifest/system/pfexecd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/rbac.xml group=sys mode=0444 +file path=lib/svc/manifest/system/rmtmpfiles.xml group=sys mode=0444 +file path=lib/svc/manifest/system/sac.xml group=sys mode=0444 +file path=lib/svc/manifest/system/svc/global.xml group=sys mode=0444 +file path=lib/svc/manifest/system/svc/restarter.xml group=sys mode=0444 +file path=lib/svc/manifest/system/system-log.xml group=sys mode=0444 +file path=lib/svc/manifest/system/utmp.xml group=sys mode=0444 +file path=lib/svc/manifest/system/vtdaemon.xml group=sys mode=0444 file path=lib/svc/method/boot-archive mode=0555 file path=lib/svc/method/boot-archive-update mode=0555 file path=lib/svc/method/console-login mode=0555 @@ -538,8 +633,12 @@ file path=lib/svc/method/svc-utmpd mode=0555 file path=lib/svc/method/system-log mode=0555 file path=lib/svc/method/vtdaemon mode=0555 file path=lib/svc/method/yp mode=0555 -file path=lib/svc/seed/global.db group=sys mode=0444 -file path=lib/svc/seed/nonglobal.db group=sys mode=0444 +# global.db is not needed in non-global zones, and it's pretty large. +file path=lib/svc/seed/global.db group=sys mode=0444 \ + variant.opensolaris.zone=global +# symmetrically, nonglobal.db is not needed in global zones. +file path=lib/svc/seed/nonglobal.db group=sys mode=0444 \ + variant.opensolaris.zone=nonglobal file path=lib/svc/share/README mode=0444 file path=lib/svc/share/fs_include.sh mode=0444 file path=lib/svc/share/ipf_include.sh mode=0444 @@ -1157,6 +1256,7 @@ file path=usr/lib/rcm/modules/SUNW_aggr_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_cluster_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_dump_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_filesys_rcm.so mode=0555 +file path=usr/lib/rcm/modules/SUNW_ibpart_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_ip_anon_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_ip_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_mpxio_rcm.so mode=0555 @@ -1165,7 +1265,6 @@ file path=usr/lib/rcm/modules/SUNW_swap_rcm.so mode=0555 $(sparc_ONLY)file path=usr/lib/rcm/modules/SUNW_ttymux_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_vlan_rcm.so mode=0555 file path=usr/lib/rcm/modules/SUNW_vnic_rcm.so mode=0555 -file path=usr/lib/rcm/modules/SUNW_ibpart_rcm.so mode=0555 file path=usr/lib/rcm/rcm_daemon mode=0555 file path=usr/lib/reparse/reparsed group=sys mode=0555 file path=usr/lib/saf/listen group=sys mode=0755 @@ -1913,104 +2012,22 @@ file path=var/sadm/system/admin/default_java group=sys mode=0444 file path=var/saf/zsmon/log group=sys preserve=true file path=var/spool/cron/crontabs/adm group=sys mode=0600 preserve=true file path=var/spool/cron/crontabs/root group=sys mode=0600 preserve=true -file path=lib/svc/manifest/milestone/multi-user-server.xml group=sys mode=0444 -file path=lib/svc/manifest/milestone/multi-user.xml group=sys mode=0444 -file path=lib/svc/manifest/milestone/name-services.xml group=sys mode=0444 -file path=lib/svc/manifest/milestone/network.xml group=sys mode=0444 -file path=lib/svc/manifest/milestone/single-user.xml group=sys mode=0444 -file path=lib/svc/manifest/milestone/sysconfig.xml group=sys mode=0444 -file path=lib/svc/manifest/network/dlmgmt.xml group=sys mode=0444 -file path=lib/svc/manifest/network/dns/client.xml group=sys mode=0444 -file path=lib/svc/manifest/network/forwarding.xml group=sys mode=0444 -file path=lib/svc/manifest/network/inetd-upgrade.xml group=sys mode=0444 -file path=lib/svc/manifest/network/inetd.xml group=sys mode=0444 -file path=lib/svc/manifest/network/ipsec/ike.xml group=sys mode=0444 -file path=lib/svc/manifest/network/ipsec/ipsecalgs.xml group=sys mode=0444 -file path=lib/svc/manifest/network/ipsec/manual-key.xml group=sys mode=0444 -file path=lib/svc/manifest/network/ipsec/policy.xml group=sys mode=0444 -file path=lib/svc/manifest/network/ldap/client.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-initial.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-ipmgmt.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-ipqos.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-iptun.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-location.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-loopback.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-netcfg.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-netmask.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-physical.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-routing-setup.xml group=sys mode=0444 -file path=lib/svc/manifest/network/network-service.xml group=sys mode=0444 -file path=lib/svc/manifest/network/routing/legacy-routing.xml group=sys \ - mode=0444 -file path=lib/svc/manifest/network/rpc/bind.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rpc/keyserv.xml group=sys mode=0444 -file path=lib/svc/manifest/network/shares/group.xml group=sys mode=0444 -file path=lib/svc/manifest/network/shares/reparsed.xml group=sys mode=0444 -file path=lib/svc/manifest/network/ssl/kssl-proxy.xml group=sys mode=0444 -file path=lib/svc/manifest/system/auditd.xml group=sys mode=0444 -file path=lib/svc/manifest/system/boot-archive-update.xml group=sys mode=0444 -file path=lib/svc/manifest/system/boot-archive.xml group=sys mode=0444 -file path=lib/svc/manifest/system/boot-config.xml group=sys mode=0444 -file path=lib/svc/manifest/system/consadm.xml group=sys mode=0444 -file path=lib/svc/manifest/system/console-login.xml group=sys mode=0444 -file path=lib/svc/manifest/system/coreadm.xml group=sys mode=0444 -file path=lib/svc/manifest/system/cron.xml group=sys mode=0444 -file path=lib/svc/manifest/system/cryptosvc.xml group=sys mode=0444 -file path=lib/svc/manifest/system/device/devices-audio.xml group=sys mode=0444 -file path=lib/svc/manifest/system/device/devices-local.xml group=sys mode=0444 -file path=lib/svc/manifest/system/device/mpxio-upgrade.xml group=sys mode=0444 -file path=lib/svc/manifest/system/extended-accounting.xml group=sys mode=0444 -file path=lib/svc/manifest/system/filesystem/local-fs.xml group=sys mode=0444 -file path=lib/svc/manifest/system/filesystem/minimal-fs.xml group=sys mode=0444 -file path=lib/svc/manifest/system/filesystem/root-fs.xml group=sys mode=0444 -file path=lib/svc/manifest/system/filesystem/usr-fs.xml group=sys mode=0444 -$(i386_ONLY)file path=lib/svc/manifest/system/hostid.xml group=sys mode=0444 -file path=lib/svc/manifest/system/hotplug.xml group=sys mode=0444 -file path=lib/svc/manifest/system/identity.xml group=sys mode=0444 -file path=lib/svc/manifest/system/idmap.xml group=sys mode=0444 -file path=lib/svc/manifest/system/keymap.xml group=sys mode=0444 -file path=lib/svc/manifest/system/early-manifest-import.xml group=sys mode=0444 -file path=lib/svc/manifest/system/manifest-import.xml group=sys mode=0444 -file path=lib/svc/manifest/system/name-service-cache.xml group=sys mode=0444 -file path=lib/svc/manifest/system/pfexecd.xml group=sys mode=0444 -file path=lib/svc/manifest/system/rbac.xml group=sys mode=0444 -file path=lib/svc/manifest/system/rmtmpfiles.xml group=sys mode=0444 -file path=lib/svc/manifest/system/sac.xml group=sys mode=0444 -file path=lib/svc/manifest/system/svc/global.xml group=sys mode=0444 -file path=lib/svc/manifest/system/svc/restarter.xml group=sys mode=0444 -file path=lib/svc/manifest/system/system-log.xml group=sys mode=0444 -file path=lib/svc/manifest/system/utmp.xml group=sys mode=0444 -file path=lib/svc/manifest/system/vtdaemon.xml group=sys mode=0444 -file path=etc/svc/profile/generic_limited_net.xml group=sys mode=0444 -file path=etc/svc/profile/generic_open.xml group=sys mode=0444 -file path=etc/svc/profile/inetd_generic.xml group=sys mode=0444 -file path=etc/svc/profile/inetd_upgrade.xml group=sys mode=0444 -file path=etc/svc/profile/ns_dns.xml group=sys mode=0444 -file path=etc/svc/profile/ns_files.xml group=sys mode=0444 -file path=etc/svc/profile/ns_ldap.xml group=sys mode=0444 -file path=etc/svc/profile/ns_nis.xml group=sys mode=0444 -file path=etc/svc/profile/ns_none.xml group=sys mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,SPARC-Enterprise.xml \ - group=sys mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-15000.xml \ - group=sys mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire-880.xml group=sys \ - mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Sun-Fire.xml group=sys \ - mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,Ultra-Enterprise-10000.xml \ - group=sys mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_SUNW,UltraSPARC-IIi-Netract.xml \ - group=sys mode=0444 -file path=etc/svc/profile/platform_none.xml group=sys mode=0444 -$(sparc_ONLY)file path=etc/svc/profile/platform_sun4v.xml group=sys mode=0444 hardlink path=etc/crypto/certs/SUNWObjectCA \ target=../../../etc/certs/SUNWObjectCA hardlink path=etc/rc2.d/S20sysetup target=../../etc/init.d/sysetup -hardlink path=etc/rc2.d/S73cachefs.daemon target=../../etc/init.d/cachefs.daemon +hardlink path=etc/rc2.d/S73cachefs.daemon \ + target=../../etc/init.d/cachefs.daemon hardlink path=etc/rc2.d/S82mkdtab target=../../etc/init.d/mkdtab hardlink path=etc/rc2.d/S89PRESERVE target=../../etc/init.d/PRESERVE hardlink path=etc/rc2.d/S98deallocate target=../../etc/init.d/deallocate +$(sparc_ONLY)hardlink path=etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml \ + target=./platform_SUNW,Sun-Fire-880.xml +$(sparc_ONLY)hardlink \ + path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml \ + target=./platform_SUNW,UltraSPARC-IIi-Netract.xml +$(sparc_ONLY)hardlink \ + path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-60.xml \ + target=./platform_SUNW,UltraSPARC-IIi-Netract.xml hardlink path=sbin/rc5 target=../sbin/rc0 hardlink path=sbin/rc6 target=../sbin/rc0 hardlink path=usr/bin/$(ARCH32)/encrypt target=decrypt @@ -2127,7 +2144,8 @@ hardlink path=usr/has/bin/view target=edit hardlink path=usr/lib/fs/hsfs/fstyp target=../../../sbin/fstyp hardlink path=usr/lib/fs/ufs/dcopy target=../../../../usr/lib/fs/ufs/clri hardlink path=usr/lib/fs/ufs/fstyp target=../../../sbin/fstyp -hardlink path=usr/lib/fs/ufs/quotaon target=../../../../usr/lib/fs/ufs/quotaoff +hardlink path=usr/lib/fs/ufs/quotaon \ + target=../../../../usr/lib/fs/ufs/quotaoff hardlink path=usr/lib/inet/in.iked target=../../../usr/lib/isaexec hardlink path=usr/sadm/bin/dispgid target=../../../usr/bin/ckgid hardlink path=usr/sadm/bin/dispuid target=../../../usr/bin/ckuid @@ -2509,14 +2527,6 @@ hardlink path=usr/share/lib/zoneinfo/W-SU \ hardlink path=usr/share/lib/zoneinfo/Zulu \ target=../../../../usr/share/lib/zoneinfo/Etc/UTC hardlink path=usr/xpg4/bin/pfsh target=../../bin/pfexec -$(sparc_ONLY)hardlink path=etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml \ - target=./platform_SUNW,Sun-Fire-880.xml -$(sparc_ONLY)hardlink \ - path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml \ - target=./platform_SUNW,UltraSPARC-IIi-Netract.xml -$(sparc_ONLY)hardlink \ - path=etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-60.xml \ - target=./platform_SUNW,UltraSPARC-IIi-Netract.xml legacy pkg=SUNWcsr arch=$(ARCH) category=system \ desc="core software for a specific instruction-set architecture" \ hotline="Please contact your local service provider" \ @@ -2717,12 +2727,12 @@ link path=usr/src target=./share/src link path=usr/tmp target=../var/tmp link path=var/ld/32 target=. link path=var/ld/64 target=$(ARCH64) +# +# The bootadm binary needs the etc/release file. +# +depend fmri=release/name type=require depend fmri=runtime/perl-584 type=require # # The loadkeys binary needs the keytables. # depend fmri=system/data/keyboard/keytables type=require -# -# The bootadm binary needs the etc/release file. -# -depend fmri=release/name type=require diff --git a/usr/src/pkg/manifests/SUNWcsd.mf b/usr/src/pkg/manifests/SUNWcsd.mf index c93f2b6e9d..8bac4cded4 100644 --- a/usr/src/pkg/manifests/SUNWcsd.mf +++ b/usr/src/pkg/manifests/SUNWcsd.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/SUNWcsd@$(PKGVERS) set name=pkg.description \ value="core entries for /dev and /devices needed for the initial boot of Solaris" set name=pkg.summary value="Core Solaris Devices" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=dev group=sys dir path=dev/dsk group=sys dir path=dev/fd group=root mode=0555 @@ -59,9 +57,9 @@ dir path=etc/rcm/scripts group=sys dir path=etc/security group=sys dir path=lib dir path=lib/svc -dir path=lib/svc/method dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/method file path=etc/dacf.conf group=sys file path=etc/devlink.tab group=sys preserve=true file path=etc/driver_aliases group=sys preserve=true @@ -74,8 +72,8 @@ file path=etc/name_to_major group=sys preserve=true file path=etc/path_to_inst group=root mode=0444 preserve=true file path=etc/security/device_policy group=sys preserve=true file path=etc/security/extra_privs group=sys preserve=true -file path=lib/svc/method/svc-syseventd mode=0555 file path=lib/svc/manifest/system/sysevent.xml group=sys mode=0444 +file path=lib/svc/method/svc-syseventd mode=0555 legacy pkg=SUNWcsd arch=$(ARCH) category=system \ desc="core entries for /dev and /devices needed for the initial boot of Solaris" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/SUNWcsl.mf b/usr/src/pkg/manifests/SUNWcsl.mf index f8b77aa70c..0365c9007a 100644 --- a/usr/src/pkg/manifests/SUNWcsl.mf +++ b/usr/src/pkg/manifests/SUNWcsl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcsl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcstl.mf b/usr/src/pkg/manifests/SUNWcstl.mf index e3e51c8a54..4c867542b4 100644 --- a/usr/src/pkg/manifests/SUNWcstl.mf +++ b/usr/src/pkg/manifests/SUNWcstl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcstl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/apptrace@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcti2.mf b/usr/src/pkg/manifests/SUNWcti2.mf index 6a31c91edd..f3ecee21b9 100644 --- a/usr/src/pkg/manifests/SUNWcti2.mf +++ b/usr/src/pkg/manifests/SUNWcti2.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcti2@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/platform/netra@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWcvc.mf b/usr/src/pkg/manifests/SUNWcvc.mf index 750f495f01..e8622664b7 100644 --- a/usr/src/pkg/manifests/SUNWcvc.mf +++ b/usr/src/pkg/manifests/SUNWcvc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWcvc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network-console@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdcaf.mf b/usr/src/pkg/manifests/SUNWdcaf.mf index a9ba971165..32081709d9 100644 --- a/usr/src/pkg/manifests/SUNWdcaf.mf +++ b/usr/src/pkg/manifests/SUNWdcaf.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdcaf@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/crypto/dca@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdcopy.mf b/usr/src/pkg/manifests/SUNWdcopy.mf index eb14b56a95..c6d80bfb15 100644 --- a/usr/src/pkg/manifests/SUNWdcopy.mf +++ b/usr/src/pkg/manifests/SUNWdcopy.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdcopy@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/i86pc/ioat@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdcs.mf b/usr/src/pkg/manifests/SUNWdcs.mf index 0d97163b8b..ce64fa65c3 100644 --- a/usr/src/pkg/manifests/SUNWdcs.mf +++ b/usr/src/pkg/manifests/SUNWdcs.mf @@ -20,13 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdcs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/domain-configuration/sparc-enterprise@0.5.11,5.11-0.133 \ +depend \ + fmri=pkg:/system/domain-configuration/sparc-enterprise@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWdfb.mf b/usr/src/pkg/manifests/SUNWdfb.mf index 3a5f71b3b5..4ab16f3aef 100644 --- a/usr/src/pkg/manifests/SUNWdfb.mf +++ b/usr/src/pkg/manifests/SUNWdfb.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdfb@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWdfbh.mf b/usr/src/pkg/manifests/SUNWdfbh.mf index 4a274be758..170fc7076f 100644 --- a/usr/src/pkg/manifests/SUNWdfbh.mf +++ b/usr/src/pkg/manifests/SUNWdfbh.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdfbh@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWdhcm.mf b/usr/src/pkg/manifests/SUNWdhcm.mf index 806c007149..b17646453b 100644 --- a/usr/src/pkg/manifests/SUNWdhcm.mf +++ b/usr/src/pkg/manifests/SUNWdhcm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdhcm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/dhcp/dhcpmgr@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdhcs.mf b/usr/src/pkg/manifests/SUNWdhcs.mf index 498a58758d..bcb2362a07 100644 --- a/usr/src/pkg/manifests/SUNWdhcs.mf +++ b/usr/src/pkg/manifests/SUNWdhcs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdhcs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/dhcp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdhcsb.mf b/usr/src/pkg/manifests/SUNWdhcsb.mf index 8aa51b66c2..fdedf169bc 100644 --- a/usr/src/pkg/manifests/SUNWdhcsb.mf +++ b/usr/src/pkg/manifests/SUNWdhcsb.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdhcsb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/dhcp/datastore/binfiles@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWdmfe.mf b/usr/src/pkg/manifests/SUNWdmfe.mf index a65fa9dbf6..329f74af21 100644 --- a/usr/src/pkg/manifests/SUNWdmfe.mf +++ b/usr/src/pkg/manifests/SUNWdmfe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdmfe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/dmfe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdmgt.mf b/usr/src/pkg/manifests/SUNWdmgt.mf index c6ee84adbf..8bc8b7b320 100644 --- a/usr/src/pkg/manifests/SUNWdmgt.mf +++ b/usr/src/pkg/manifests/SUNWdmgt.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdmgt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/management/wbem/data-management@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWdoc.mf b/usr/src/pkg/manifests/SUNWdoc.mf index f82d72a816..9dad6b2b51 100644 --- a/usr/src/pkg/manifests/SUNWdoc.mf +++ b/usr/src/pkg/manifests/SUNWdoc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdoc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/text/doctools@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdpl.mf b/usr/src/pkg/manifests/SUNWdpl.mf index 1332f3e878..d9d83cc3b0 100644 --- a/usr/src/pkg/manifests/SUNWdpl.mf +++ b/usr/src/pkg/manifests/SUNWdpl.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdpl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/developer/library/profiled-libc@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/developer/library/profiled-libc@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWdrcr.mf b/usr/src/pkg/manifests/SUNWdrcr.mf index ad4c443acd..ee1b911f8b 100644 --- a/usr/src/pkg/manifests/SUNWdrcr.mf +++ b/usr/src/pkg/manifests/SUNWdrcr.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdrcr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/system/kernel/dynamic-reconfiguration/sun-fire-15000@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWdrmr.mf b/usr/src/pkg/manifests/SUNWdrmr.mf index eb9a7c8842..f52b619eaa 100644 --- a/usr/src/pkg/manifests/SUNWdrmr.mf +++ b/usr/src/pkg/manifests/SUNWdrmr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdrmr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/drm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdrr.mf b/usr/src/pkg/manifests/SUNWdrr.mf index 7dae4d7691..ba33e0a53e 100644 --- a/usr/src/pkg/manifests/SUNWdrr.mf +++ b/usr/src/pkg/manifests/SUNWdrr.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdrr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/system/kernel/dynamic-reconfiguration/ultra-enterprise-10000@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWdscp.mf b/usr/src/pkg/manifests/SUNWdscp.mf index 03c8197df1..89c7b378d2 100644 --- a/usr/src/pkg/manifests/SUNWdscp.mf +++ b/usr/src/pkg/manifests/SUNWdscp.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdscp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/system/domain-service-processor-protocol/sparc-enterprise@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWdsd.mf b/usr/src/pkg/manifests/SUNWdsd.mf index a86238507f..3e532baf7f 100644 --- a/usr/src/pkg/manifests/SUNWdsd.mf +++ b/usr/src/pkg/manifests/SUNWdsd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdsd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/dns/mdns@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdtrc.mf b/usr/src/pkg/manifests/SUNWdtrc.mf index 48036c4a9a..1b40f36774 100644 --- a/usr/src/pkg/manifests/SUNWdtrc.mf +++ b/usr/src/pkg/manifests/SUNWdtrc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdtrc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/dtrace@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdtrp.mf b/usr/src/pkg/manifests/SUNWdtrp.mf index 00571457ad..d7d58b279d 100644 --- a/usr/src/pkg/manifests/SUNWdtrp.mf +++ b/usr/src/pkg/manifests/SUNWdtrp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdtrp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/dtrace/providers@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWdtrt.mf b/usr/src/pkg/manifests/SUNWdtrt.mf index 6e32fec435..9a1bf4007c 100644 --- a/usr/src/pkg/manifests/SUNWdtrt.mf +++ b/usr/src/pkg/manifests/SUNWdtrt.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWdtrt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/dtrace/tests@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWefc.mf b/usr/src/pkg/manifests/SUNWefc.mf index 5a0836b314..d4379cde41 100644 --- a/usr/src/pkg/manifests/SUNWefc.mf +++ b/usr/src/pkg/manifests/SUNWefc.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWefc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/embedded-fcode-interpreter@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWemlxs.mf b/usr/src/pkg/manifests/SUNWemlxs.mf index a9898e4771..e1d80b04f0 100644 --- a/usr/src/pkg/manifests/SUNWemlxs.mf +++ b/usr/src/pkg/manifests/SUNWemlxs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWemlxs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/emlxs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWerid.mf b/usr/src/pkg/manifests/SUNWerid.mf index 703e130f19..8f5c93efc6 100644 --- a/usr/src/pkg/manifests/SUNWerid.mf +++ b/usr/src/pkg/manifests/SUNWerid.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWerid@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/eri@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWesu.mf b/usr/src/pkg/manifests/SUNWesu.mf index 49587ad579..e6eecbe0c7 100644 --- a/usr/src/pkg/manifests/SUNWesu.mf +++ b/usr/src/pkg/manifests/SUNWesu.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWesu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/extended-system-utilities@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/system/extended-system-utilities@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWfchba.mf b/usr/src/pkg/manifests/SUNWfchba.mf index 94b4aebff3..9fffc30eb8 100644 --- a/usr/src/pkg/manifests/SUNWfchba.mf +++ b/usr/src/pkg/manifests/SUNWfchba.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfchba@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/system/library/storage/fibre-channel/libsun_fc@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWfcip.mf b/usr/src/pkg/manifests/SUNWfcip.mf index 6f9ec2d302..8a84c41136 100644 --- a/usr/src/pkg/manifests/SUNWfcip.mf +++ b/usr/src/pkg/manifests/SUNWfcip.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcip@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fcip@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfcmdb.mf b/usr/src/pkg/manifests/SUNWfcmdb.mf index 32efe6617c..41d8f5ec70 100644 --- a/usr/src/pkg/manifests/SUNWfcmdb.mf +++ b/usr/src/pkg/manifests/SUNWfcmdb.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcmdb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/developer/debug/mdb/module/module-fibre-channel@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWfcoe.mf b/usr/src/pkg/manifests/SUNWfcoe.mf index 7a2c3637fa..c923b26c07 100644 --- a/usr/src/pkg/manifests/SUNWfcoe.mf +++ b/usr/src/pkg/manifests/SUNWfcoe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcoe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fcoe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfcoei.mf b/usr/src/pkg/manifests/SUNWfcoei.mf index a4b4038aa9..40d89bb31d 100644 --- a/usr/src/pkg/manifests/SUNWfcoei.mf +++ b/usr/src/pkg/manifests/SUNWfcoei.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcoei@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fcoei@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfcoet.mf b/usr/src/pkg/manifests/SUNWfcoet.mf index d550924761..58d2976546 100644 --- a/usr/src/pkg/manifests/SUNWfcoet.mf +++ b/usr/src/pkg/manifests/SUNWfcoet.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcoet@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fcoet@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfcoeu.mf b/usr/src/pkg/manifests/SUNWfcoeu.mf index 00f84ae708..d68e107850 100644 --- a/usr/src/pkg/manifests/SUNWfcoeu.mf +++ b/usr/src/pkg/manifests/SUNWfcoeu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcoeu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/libfcoe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfcp.mf b/usr/src/pkg/manifests/SUNWfcp.mf index 6cce68656c..3e6e9881bb 100644 --- a/usr/src/pkg/manifests/SUNWfcp.mf +++ b/usr/src/pkg/manifests/SUNWfcp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fcp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfcprt.mf b/usr/src/pkg/manifests/SUNWfcprt.mf index 296cd46ec1..fde1551bc6 100644 --- a/usr/src/pkg/manifests/SUNWfcprt.mf +++ b/usr/src/pkg/manifests/SUNWfcprt.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcprt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/storage/fibre-channel/port-utility@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWfcsm.mf b/usr/src/pkg/manifests/SUNWfcsm.mf index f93aab49ec..27800321d0 100644 --- a/usr/src/pkg/manifests/SUNWfcsm.mf +++ b/usr/src/pkg/manifests/SUNWfcsm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfcsm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fcsm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfctl.mf b/usr/src/pkg/manifests/SUNWfctl.mf index a6b510d923..30eb97aab0 100644 --- a/usr/src/pkg/manifests/SUNWfctl.mf +++ b/usr/src/pkg/manifests/SUNWfctl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfctl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/fp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfilebench.mf b/usr/src/pkg/manifests/SUNWfilebench.mf index e0b719de69..0f4b146f92 100644 --- a/usr/src/pkg/manifests/SUNWfilebench.mf +++ b/usr/src/pkg/manifests/SUNWfilebench.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfilebench@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/benchmark/filebench@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfipe.mf b/usr/src/pkg/manifests/SUNWfipe.mf index 8c13772c45..c30c45d7e4 100644 --- a/usr/src/pkg/manifests/SUNWfipe.mf +++ b/usr/src/pkg/manifests/SUNWfipe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfipe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/i86pc/fipe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfmd.mf b/usr/src/pkg/manifests/SUNWfmd.mf index b78403b490..9056abade6 100644 --- a/usr/src/pkg/manifests/SUNWfmd.mf +++ b/usr/src/pkg/manifests/SUNWfmd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfmd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/fault-management@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfruid.mf b/usr/src/pkg/manifests/SUNWfruid.mf index 1882f0b8ae..bd032b74d8 100644 --- a/usr/src/pkg/manifests/SUNWfruid.mf +++ b/usr/src/pkg/manifests/SUNWfruid.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfruid@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/fru-id@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfruip.mf b/usr/src/pkg/manifests/SUNWfruip.mf index 268b510fca..49d1d1682a 100644 --- a/usr/src/pkg/manifests/SUNWfruip.mf +++ b/usr/src/pkg/manifests/SUNWfruip.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfruip@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/fru-id/platform@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfs.mf b/usr/src/pkg/manifests/SUNWfs.mf index 821a329251..517d720076 100644 --- a/usr/src/pkg/manifests/SUNWfs.mf +++ b/usr/src/pkg/manifests/SUNWfs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/floating-point-scrubber@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfss.mf b/usr/src/pkg/manifests/SUNWfss.mf index 8cbd82a576..d917004131 100644 --- a/usr/src/pkg/manifests/SUNWfss.mf +++ b/usr/src/pkg/manifests/SUNWfss.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfss@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/scheduler/fss@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWftdu.mf b/usr/src/pkg/manifests/SUNWftdu.mf index 18c1a98aaa..fda5dec114 100644 --- a/usr/src/pkg/manifests/SUNWftdu.mf +++ b/usr/src/pkg/manifests/SUNWftdu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWftdu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/driver/ftsafe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWftp.mf b/usr/src/pkg/manifests/SUNWftp.mf index ea780cc6a2..486bd596de 100644 --- a/usr/src/pkg/manifests/SUNWftp.mf +++ b/usr/src/pkg/manifests/SUNWftp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWftp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/ftp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfwdc.mf b/usr/src/pkg/manifests/SUNWfwdc.mf index 655100f075..20af4ab459 100644 --- a/usr/src/pkg/manifests/SUNWfwdc.mf +++ b/usr/src/pkg/manifests/SUNWfwdc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfwdc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/dcam1394@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWfwdcu.mf b/usr/src/pkg/manifests/SUNWfwdcu.mf index 85a0241354..fa23ad0984 100644 --- a/usr/src/pkg/manifests/SUNWfwdcu.mf +++ b/usr/src/pkg/manifests/SUNWfwdcu.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfwdcu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/dcam1394/devfsadm-dcam1394@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWfwflash.mf b/usr/src/pkg/manifests/SUNWfwflash.mf index 86831e152a..4968505f76 100644 --- a/usr/src/pkg/manifests/SUNWfwflash.mf +++ b/usr/src/pkg/manifests/SUNWfwflash.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWfwflash@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/flash/fwflash@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWgrub.mf b/usr/src/pkg/manifests/SUNWgrub.mf index a70b746c41..5c8849725b 100644 --- a/usr/src/pkg/manifests/SUNWgrub.mf +++ b/usr/src/pkg/manifests/SUNWgrub.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWgrub@0.97,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/boot/grub@0.97,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWgrubS.mf b/usr/src/pkg/manifests/SUNWgrubS.mf index 2625ba3eb2..27c4172d48 100644 --- a/usr/src/pkg/manifests/SUNWgrubS.mf +++ b/usr/src/pkg/manifests/SUNWgrubS.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWgrubS@0.97,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/source/system/grub@0.97,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWgss.mf b/usr/src/pkg/manifests/SUNWgss.mf index 56e106efbf..6f06dda30f 100644 --- a/usr/src/pkg/manifests/SUNWgss.mf +++ b/usr/src/pkg/manifests/SUNWgss.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWgss@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/security/gss@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWgssc.mf b/usr/src/pkg/manifests/SUNWgssc.mf index f4d4fb712e..bca94997f2 100644 --- a/usr/src/pkg/manifests/SUNWgssc.mf +++ b/usr/src/pkg/manifests/SUNWgssc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWgssc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/security/gss@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWgssdh.mf b/usr/src/pkg/manifests/SUNWgssdh.mf index 520fc3fb9d..02743ffaa7 100644 --- a/usr/src/pkg/manifests/SUNWgssdh.mf +++ b/usr/src/pkg/manifests/SUNWgssdh.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWgssdh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/security/gss/diffie-hellman@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWgssk.mf b/usr/src/pkg/manifests/SUNWgssk.mf index 42a965f2dd..2713a3044c 100644 --- a/usr/src/pkg/manifests/SUNWgssk.mf +++ b/usr/src/pkg/manifests/SUNWgssk.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWgssk@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/security/gss@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhal.mf b/usr/src/pkg/manifests/SUNWhal.mf index a20801573b..e4a3f9c3d9 100644 --- a/usr/src/pkg/manifests/SUNWhal.mf +++ b/usr/src/pkg/manifests/SUNWhal.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhal@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/hal@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhea.mf b/usr/src/pkg/manifests/SUNWhea.mf index 252f1d342c..da09481091 100644 --- a/usr/src/pkg/manifests/SUNWhea.mf +++ b/usr/src/pkg/manifests/SUNWhea.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhea@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhermon.mf b/usr/src/pkg/manifests/SUNWhermon.mf index b490a8349b..9e38d0db5f 100644 --- a/usr/src/pkg/manifests/SUNWhermon.mf +++ b/usr/src/pkg/manifests/SUNWhermon.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhermon@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/hermon@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhmd.mf b/usr/src/pkg/manifests/SUNWhmd.mf index 47ca942556..4700652075 100644 --- a/usr/src/pkg/manifests/SUNWhmd.mf +++ b/usr/src/pkg/manifests/SUNWhmd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhmd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/hme@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhmdu.mf b/usr/src/pkg/manifests/SUNWhmdu.mf index 69509137b7..2505ad6417 100644 --- a/usr/src/pkg/manifests/SUNWhmdu.mf +++ b/usr/src/pkg/manifests/SUNWhmdu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhmdu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/fas/header-fas@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhwdata.mf b/usr/src/pkg/manifests/SUNWhwdata.mf index f5b6eb1b94..32afbd7cb8 100644 --- a/usr/src/pkg/manifests/SUNWhwdata.mf +++ b/usr/src/pkg/manifests/SUNWhwdata.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhwdata@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/data/hardware-registry@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWhxge.mf b/usr/src/pkg/manifests/SUNWhxge.mf index ef9fafe9ca..d4d8614566 100644 --- a/usr/src/pkg/manifests/SUNWhxge.mf +++ b/usr/src/pkg/manifests/SUNWhxge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWhxge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/hxge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWib.mf b/usr/src/pkg/manifests/SUNWib.mf index 900861bb2f..6255b1cef2 100644 --- a/usr/src/pkg/manifests/SUNWib.mf +++ b/usr/src/pkg/manifests/SUNWib.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWib@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ib@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWibdma.mf b/usr/src/pkg/manifests/SUNWibdma.mf index a0b6756c38..295accd198 100644 --- a/usr/src/pkg/manifests/SUNWibdma.mf +++ b/usr/src/pkg/manifests/SUNWibdma.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWibdma@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ibdma@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWibsdp.mf b/usr/src/pkg/manifests/SUNWibsdp.mf index 9360275630..46263ac3b2 100644 --- a/usr/src/pkg/manifests/SUNWibsdp.mf +++ b/usr/src/pkg/manifests/SUNWibsdp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWibsdp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/sdp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWibsdpib.mf b/usr/src/pkg/manifests/SUNWibsdpib.mf index 7de5ad776e..7b62e98993 100644 --- a/usr/src/pkg/manifests/SUNWibsdpib.mf +++ b/usr/src/pkg/manifests/SUNWibsdpib.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWibsdpib@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/sdpib@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWibsdpu.mf b/usr/src/pkg/manifests/SUNWibsdpu.mf index db80cf1221..8397859349 100644 --- a/usr/src/pkg/manifests/SUNWibsdpu.mf +++ b/usr/src/pkg/manifests/SUNWibsdpu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWibsdpu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/spdadm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWidn.mf b/usr/src/pkg/manifests/SUNWidn.mf index e1834c2a9c..0ba1239f8e 100644 --- a/usr/src/pkg/manifests/SUNWidn.mf +++ b/usr/src/pkg/manifests/SUNWidn.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWidn@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/system/kernel/inter-domain/ultra-enterprise-10000@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWifp.mf b/usr/src/pkg/manifests/SUNWifp.mf index e9852e7524..b7a34c3baf 100644 --- a/usr/src/pkg/manifests/SUNWifp.mf +++ b/usr/src/pkg/manifests/SUNWifp.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWifp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/ifp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWifph.mf b/usr/src/pkg/manifests/SUNWifph.mf index 70376c49b2..407a5aa9f3 100644 --- a/usr/src/pkg/manifests/SUNWifph.mf +++ b/usr/src/pkg/manifests/SUNWifph.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWifph@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-ifp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWigb.mf b/usr/src/pkg/manifests/SUNWigb.mf index b11a6274fa..244e7c2e8b 100644 --- a/usr/src/pkg/manifests/SUNWigb.mf +++ b/usr/src/pkg/manifests/SUNWigb.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWigb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/igb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWii.mf b/usr/src/pkg/manifests/SUNWii.mf index 220aa84de4..65bb000547 100644 --- a/usr/src/pkg/manifests/SUNWii.mf +++ b/usr/src/pkg/manifests/SUNWii.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWii@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/avs/point-in-time-copy@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWilb.mf b/usr/src/pkg/manifests/SUNWilb.mf index 3de0899f01..76453e8211 100644 --- a/usr/src/pkg/manifests/SUNWilb.mf +++ b/usr/src/pkg/manifests/SUNWilb.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWilb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/load-balancer/ilb@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWima.mf b/usr/src/pkg/manifests/SUNWima.mf index 5797a0a7a5..823ddd95cb 100644 --- a/usr/src/pkg/manifests/SUNWima.mf +++ b/usr/src/pkg/manifests/SUNWima.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWima@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/storage/ima@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWimac.mf b/usr/src/pkg/manifests/SUNWimac.mf index d11cde070d..f42362e48e 100644 --- a/usr/src/pkg/manifests/SUNWimac.mf +++ b/usr/src/pkg/manifests/SUNWimac.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWimac@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/storage/ima/header-ima@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWinstallint.mf b/usr/src/pkg/manifests/SUNWinstallint.mf index 28053999c4..af883b296d 100644 --- a/usr/src/pkg/manifests/SUNWinstallint.mf +++ b/usr/src/pkg/manifests/SUNWinstallint.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWinstallint@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/install/libinstzones@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWintgige.mf b/usr/src/pkg/manifests/SUNWintgige.mf index 2e0cd1869f..124193d6d5 100644 --- a/usr/src/pkg/manifests/SUNWintgige.mf +++ b/usr/src/pkg/manifests/SUNWintgige.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWintgige@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/e1000g@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWio-tools.mf b/usr/src/pkg/manifests/SUNWio-tools.mf index 2131ce17dd..41673ecc6f 100644 --- a/usr/src/pkg/manifests/SUNWio-tools.mf +++ b/usr/src/pkg/manifests/SUNWio-tools.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWio-tools@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/management/pcitool@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiopc.mf b/usr/src/pkg/manifests/SUNWiopc.mf index 78a1081c84..508e0da90a 100644 --- a/usr/src/pkg/manifests/SUNWiopc.mf +++ b/usr/src/pkg/manifests/SUNWiopc.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiopc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/io-performance-counters@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWiot.mf b/usr/src/pkg/manifests/SUNWiot.mf index 8c6349d965..95ea17aab2 100644 --- a/usr/src/pkg/manifests/SUNWiot.mf +++ b/usr/src/pkg/manifests/SUNWiot.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiot@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/io/tests@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWipc.mf b/usr/src/pkg/manifests/SUNWipc.mf index 9954cd56cc..967d7255b3 100644 --- a/usr/src/pkg/manifests/SUNWipc.mf +++ b/usr/src/pkg/manifests/SUNWipc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWipc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/ipc@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWipf.mf b/usr/src/pkg/manifests/SUNWipf.mf index 329a4bc947..6c8f86974e 100644 --- a/usr/src/pkg/manifests/SUNWipf.mf +++ b/usr/src/pkg/manifests/SUNWipf.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWipf@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/ipfilter@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWipfh.mf b/usr/src/pkg/manifests/SUNWipfh.mf index 12d69f96b6..c79c2f496d 100644 --- a/usr/src/pkg/manifests/SUNWipfh.mf +++ b/usr/src/pkg/manifests/SUNWipfh.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWipfh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/network/ipfilter/header-ipfilter@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/network/ipfilter/header-ipfilter@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWipoib.mf b/usr/src/pkg/manifests/SUNWipoib.mf index 4255afc262..ee3f404a52 100644 --- a/usr/src/pkg/manifests/SUNWipoib.mf +++ b/usr/src/pkg/manifests/SUNWipoib.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWipoib@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ibd@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWippcore.mf b/usr/src/pkg/manifests/SUNWippcore.mf index 8b73b15d78..c3e9ac8bde 100644 --- a/usr/src/pkg/manifests/SUNWippcore.mf +++ b/usr/src/pkg/manifests/SUNWippcore.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWippcore@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp/ipp/libipp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWippl.mf b/usr/src/pkg/manifests/SUNWippl.mf index 62d24e24da..e654f167b9 100644 --- a/usr/src/pkg/manifests/SUNWippl.mf +++ b/usr/src/pkg/manifests/SUNWippl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWippl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp/ipp/ipp-listener@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWipw.mf b/usr/src/pkg/manifests/SUNWipw.mf index 07b674cebd..7a75c37bc6 100644 --- a/usr/src/pkg/manifests/SUNWipw.mf +++ b/usr/src/pkg/manifests/SUNWipw.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWipw@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ipw@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiscsi.mf b/usr/src/pkg/manifests/SUNWiscsi.mf index ca3776c76c..deb6e0432e 100644 --- a/usr/src/pkg/manifests/SUNWiscsi.mf +++ b/usr/src/pkg/manifests/SUNWiscsi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiscsi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/iscsi/initiator@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiscsidm.mf b/usr/src/pkg/manifests/SUNWiscsidm.mf index 0c6e7077e7..02cfd72f26 100644 --- a/usr/src/pkg/manifests/SUNWiscsidm.mf +++ b/usr/src/pkg/manifests/SUNWiscsidm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiscsidm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/iscsi/iser@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiscsit.mf b/usr/src/pkg/manifests/SUNWiscsit.mf index 18d553e748..616210a933 100644 --- a/usr/src/pkg/manifests/SUNWiscsit.mf +++ b/usr/src/pkg/manifests/SUNWiscsit.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiscsit@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/iscsi/target@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiscsitgt.mf b/usr/src/pkg/manifests/SUNWiscsitgt.mf index 5b41ebafbd..69bb61ed2d 100644 --- a/usr/src/pkg/manifests/SUNWiscsitgt.mf +++ b/usr/src/pkg/manifests/SUNWiscsitgt.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/SUNWiscsitgt@0.5.11,5.11-0.133 -set name=pkg.renamed value=true +# Was renamed to network/iscsi/target/legacy, both now obsolete. + +set name=pkg.fmri value=pkg:/SUNWiscsitgt@0.5.11,5.11-0.143 +set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/network/iscsi/target/legacy@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWisns.mf b/usr/src/pkg/manifests/SUNWisns.mf index e4fd9aee95..338c354ca4 100644 --- a/usr/src/pkg/manifests/SUNWisns.mf +++ b/usr/src/pkg/manifests/SUNWisns.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWisns@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/storage/isns@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWisp.mf b/usr/src/pkg/manifests/SUNWisp.mf index a1124b6577..cf5411c86f 100644 --- a/usr/src/pkg/manifests/SUNWisp.mf +++ b/usr/src/pkg/manifests/SUNWisp.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWisp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/isp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiwh.mf b/usr/src/pkg/manifests/SUNWiwh.mf index 6085306c41..2c4ce66bf1 100644 --- a/usr/src/pkg/manifests/SUNWiwh.mf +++ b/usr/src/pkg/manifests/SUNWiwh.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiwh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/iwh@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiwi.mf b/usr/src/pkg/manifests/SUNWiwi.mf index 32be217f93..0fbdca81f1 100644 --- a/usr/src/pkg/manifests/SUNWiwi.mf +++ b/usr/src/pkg/manifests/SUNWiwi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiwi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/iwi@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiwk.mf b/usr/src/pkg/manifests/SUNWiwk.mf index 4aee7f1c73..6ab54f0017 100644 --- a/usr/src/pkg/manifests/SUNWiwk.mf +++ b/usr/src/pkg/manifests/SUNWiwk.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiwk@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/iwk@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWiwp.mf b/usr/src/pkg/manifests/SUNWiwp.mf index fba475bdb9..4f69de6397 100644 --- a/usr/src/pkg/manifests/SUNWiwp.mf +++ b/usr/src/pkg/manifests/SUNWiwp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWiwp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/iwp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWixgb.mf b/usr/src/pkg/manifests/SUNWixgb.mf index 08b6cd058f..a88ebe27ff 100644 --- a/usr/src/pkg/manifests/SUNWixgb.mf +++ b/usr/src/pkg/manifests/SUNWixgb.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWixgb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ixgb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWixgbe.mf b/usr/src/pkg/manifests/SUNWixgbe.mf index 0fdbde773c..07ef41c9ca 100644 --- a/usr/src/pkg/manifests/SUNWixgbe.mf +++ b/usr/src/pkg/manifests/SUNWixgbe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWixgbe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ixgbe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWkdc.mf b/usr/src/pkg/manifests/SUNWkdc.mf index 3eb8f02a6f..a87fed2256 100644 --- a/usr/src/pkg/manifests/SUNWkdc.mf +++ b/usr/src/pkg/manifests/SUNWkdc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWkdc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/security/kerberos-5@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWkey.mf b/usr/src/pkg/manifests/SUNWkey.mf index fd4da33093..c21692ffdc 100644 --- a/usr/src/pkg/manifests/SUNWkey.mf +++ b/usr/src/pkg/manifests/SUNWkey.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWkey@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/data/keyboard/keytables@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWkrb.mf b/usr/src/pkg/manifests/SUNWkrb.mf index 32f11dee5a..9374d096ae 100644 --- a/usr/src/pkg/manifests/SUNWkrb.mf +++ b/usr/src/pkg/manifests/SUNWkrb.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWkrb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/security/kerberos-5@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWksh88.mf b/usr/src/pkg/manifests/SUNWksh88.mf index 530a5be7df..0b8a2f9d91 100644 --- a/usr/src/pkg/manifests/SUNWksh88.mf +++ b/usr/src/pkg/manifests/SUNWksh88.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWksh88@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/shell/ksh88@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWkvm.mf b/usr/src/pkg/manifests/SUNWkvm.mf index 32814004d2..b422944d19 100644 --- a/usr/src/pkg/manifests/SUNWkvm.mf +++ b/usr/src/pkg/manifests/SUNWkvm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWkvm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/platform@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWlatencytop.mf b/usr/src/pkg/manifests/SUNWlatencytop.mf index 2d969686d7..cbf27b7332 100644 --- a/usr/src/pkg/manifests/SUNWlatencytop.mf +++ b/usr/src/pkg/manifests/SUNWlatencytop.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWlatencytop@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/diagnostic/latencytop@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWldom.mf b/usr/src/pkg/manifests/SUNWldom.mf index ef19fad607..a46ec0dbd3 100644 --- a/usr/src/pkg/manifests/SUNWldom.mf +++ b/usr/src/pkg/manifests/SUNWldom.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWldom@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/ldoms@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWldskint.mf b/usr/src/pkg/manifests/SUNWldskint.mf index b9e5786253..72722bc83b 100644 --- a/usr/src/pkg/manifests/SUNWldskint.mf +++ b/usr/src/pkg/manifests/SUNWldskint.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWldskint@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/libdiskmgt/header-libdiskmgt@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWlibsasl.mf b/usr/src/pkg/manifests/SUNWlibsasl.mf index dabfaa16d7..cab24462e3 100644 --- a/usr/src/pkg/manifests/SUNWlibsasl.mf +++ b/usr/src/pkg/manifests/SUNWlibsasl.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWlibsasl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/library/security/libsasl@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/system/library/security/libsasl@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWllc.mf b/usr/src/pkg/manifests/SUNWllc.mf index b12e5a5b65..4bc0362161 100644 --- a/usr/src/pkg/manifests/SUNWllc.mf +++ b/usr/src/pkg/manifests/SUNWllc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWllc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/llc2@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWlldap.mf b/usr/src/pkg/manifests/SUNWlldap.mf index 8418df2c0f..bfe1d3b09d 100644 --- a/usr/src/pkg/manifests/SUNWlldap.mf +++ b/usr/src/pkg/manifests/SUNWlldap.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWlldap@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/naming/ldap@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWloc.mf b/usr/src/pkg/manifests/SUNWloc.mf index 64db189fe2..7da652aa39 100644 --- a/usr/src/pkg/manifests/SUNWloc.mf +++ b/usr/src/pkg/manifests/SUNWloc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWloc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/text/locale@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWlp-cmds.mf b/usr/src/pkg/manifests/SUNWlp-cmds.mf index ab4a192a00..4f2da711e4 100644 --- a/usr/src/pkg/manifests/SUNWlp-cmds.mf +++ b/usr/src/pkg/manifests/SUNWlp-cmds.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWlp-cmds@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWlpr-cmds.mf b/usr/src/pkg/manifests/SUNWlpr-cmds.mf index 56b954742c..7c24e7dfbe 100644 --- a/usr/src/pkg/manifests/SUNWlpr-cmds.mf +++ b/usr/src/pkg/manifests/SUNWlpr-cmds.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWlpr-cmds@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWlsimega.mf b/usr/src/pkg/manifests/SUNWlsimega.mf index b8552b96b0..293dd6c407 100644 --- a/usr/src/pkg/manifests/SUNWlsimega.mf +++ b/usr/src/pkg/manifests/SUNWlsimega.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWlsimega@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/lsimega@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWluxd.mf b/usr/src/pkg/manifests/SUNWluxd.mf index cc22fbfdd8..fd8704c2ad 100644 --- a/usr/src/pkg/manifests/SUNWluxd.mf +++ b/usr/src/pkg/manifests/SUNWluxd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWluxd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/sf@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWluxl.mf b/usr/src/pkg/manifests/SUNWluxl.mf index 1926be3006..a725ac9603 100644 --- a/usr/src/pkg/manifests/SUNWluxl.mf +++ b/usr/src/pkg/manifests/SUNWluxl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWluxl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/socal@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWluxop.mf b/usr/src/pkg/manifests/SUNWluxop.mf index ef8f910c07..c4648cbf1c 100644 --- a/usr/src/pkg/manifests/SUNWluxop.mf +++ b/usr/src/pkg/manifests/SUNWluxop.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWluxop@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/storage/luxadm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWluxopr.mf b/usr/src/pkg/manifests/SUNWluxopr.mf index 99b3c58160..4d15237bc5 100644 --- a/usr/src/pkg/manifests/SUNWluxopr.mf +++ b/usr/src/pkg/manifests/SUNWluxopr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWluxopr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/library/network-array@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWlx.mf b/usr/src/pkg/manifests/SUNWlx.mf index d72b3d6602..0d5d285fe5 100644 --- a/usr/src/pkg/manifests/SUNWlx.mf +++ b/usr/src/pkg/manifests/SUNWlx.mf @@ -28,4 +28,3 @@ set name=pkg.fmri value=pkg:/SUNWlx@0.5.11,5.11-0.143 set name=pkg.obsolete value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWmd.mf b/usr/src/pkg/manifests/SUNWmd.mf index a8513607d7..10287616a7 100644 --- a/usr/src/pkg/manifests/SUNWmd.mf +++ b/usr/src/pkg/manifests/SUNWmd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/svm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmda.mf b/usr/src/pkg/manifests/SUNWmda.mf index 52ac05d4a7..625c51e35a 100644 --- a/usr/src/pkg/manifests/SUNWmda.mf +++ b/usr/src/pkg/manifests/SUNWmda.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmda@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/metassist@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmdb.mf b/usr/src/pkg/manifests/SUNWmdb.mf index 5420f3e652..2ff63f5ee3 100644 --- a/usr/src/pkg/manifests/SUNWmdb.mf +++ b/usr/src/pkg/manifests/SUNWmdb.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmdb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/debug/mdb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmdbdm.mf b/usr/src/pkg/manifests/SUNWmdbdm.mf index c82d441684..9479a57818 100644 --- a/usr/src/pkg/manifests/SUNWmdbdm.mf +++ b/usr/src/pkg/manifests/SUNWmdbdm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmdbdm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/source/demo/mdb-examples@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmddr.mf b/usr/src/pkg/manifests/SUNWmddr.mf index 13371ddbc4..a3295da4e3 100644 --- a/usr/src/pkg/manifests/SUNWmddr.mf +++ b/usr/src/pkg/manifests/SUNWmddr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmddr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/svm-rcm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmegasas.mf b/usr/src/pkg/manifests/SUNWmegasas.mf index 6d5c45b27d..d157236779 100644 --- a/usr/src/pkg/manifests/SUNWmegasas.mf +++ b/usr/src/pkg/manifests/SUNWmegasas.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmegasas@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/mega_sas@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmibii.mf b/usr/src/pkg/manifests/SUNWmibii.mf index 0754bd0512..9510511ce3 100644 --- a/usr/src/pkg/manifests/SUNWmibii.mf +++ b/usr/src/pkg/manifests/SUNWmibii.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmibii@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/snmp/mibiisa@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmms.mf b/usr/src/pkg/manifests/SUNWmms.mf index c06681fd74..a8b3792eb6 100644 --- a/usr/src/pkg/manifests/SUNWmms.mf +++ b/usr/src/pkg/manifests/SUNWmms.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/SUNWmms@0.5.11,5.11-0.133 -set name=pkg.renamed value=true +# Was renamed to system/storage/mms, both now obsolete. + +set name=pkg.fmri value=pkg:/SUNWmms@0.5.11,5.11-0.143 +set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/storage/mms@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmpapi.mf b/usr/src/pkg/manifests/SUNWmpapi.mf index 477e8a5bf2..83d6f33b7a 100644 --- a/usr/src/pkg/manifests/SUNWmpapi.mf +++ b/usr/src/pkg/manifests/SUNWmpapi.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmpapi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/library/storage/libmpapi@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/system/library/storage/libmpapi@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWmpathadm.mf b/usr/src/pkg/manifests/SUNWmpathadm.mf index e4e38fae80..eede770752 100644 --- a/usr/src/pkg/manifests/SUNWmpathadm.mf +++ b/usr/src/pkg/manifests/SUNWmpathadm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmpathadm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/mpathadm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmpsvplr.mf b/usr/src/pkg/manifests/SUNWmpsvplr.mf index ee2628d54f..287bb02409 100644 --- a/usr/src/pkg/manifests/SUNWmpsvplr.mf +++ b/usr/src/pkg/manifests/SUNWmpsvplr.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmpsvplr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/storage/libmpscsi_vhci@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWmptsas.mf b/usr/src/pkg/manifests/SUNWmptsas.mf index 691971d192..83cec53cce 100644 --- a/usr/src/pkg/manifests/SUNWmptsas.mf +++ b/usr/src/pkg/manifests/SUNWmptsas.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmptsas@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/mpt_sas@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmrsas.mf b/usr/src/pkg/manifests/SUNWmrsas.mf index ceaed44c05..90b1c586fd 100644 --- a/usr/src/pkg/manifests/SUNWmrsas.mf +++ b/usr/src/pkg/manifests/SUNWmrsas.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmrsas@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/mr_sas@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmv88sx.mf b/usr/src/pkg/manifests/SUNWmv88sx.mf index 46358a6585..006f0208ac 100644 --- a/usr/src/pkg/manifests/SUNWmv88sx.mf +++ b/usr/src/pkg/manifests/SUNWmv88sx.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmv88sx@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/marvell88sx@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmwl.mf b/usr/src/pkg/manifests/SUNWmwl.mf index cfbf87cd2f..2965558356 100644 --- a/usr/src/pkg/manifests/SUNWmwl.mf +++ b/usr/src/pkg/manifests/SUNWmwl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmwl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/mwl@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmxfe.mf b/usr/src/pkg/manifests/SUNWmxfe.mf index dc378694bc..63d4b77919 100644 --- a/usr/src/pkg/manifests/SUNWmxfe.mf +++ b/usr/src/pkg/manifests/SUNWmxfe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmxfe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/mxfe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWmyri10ge.mf b/usr/src/pkg/manifests/SUNWmyri10ge.mf index e5eced6569..73482b7e33 100644 --- a/usr/src/pkg/manifests/SUNWmyri10ge.mf +++ b/usr/src/pkg/manifests/SUNWmyri10ge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWmyri10ge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/myri10ge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWn2cp.mf b/usr/src/pkg/manifests/SUNWn2cp.mf index 19f819daae..95966e794c 100644 --- a/usr/src/pkg/manifests/SUNWn2cp.mf +++ b/usr/src/pkg/manifests/SUNWn2cp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWn2cp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/crypto/n2cp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnca.mf b/usr/src/pkg/manifests/SUNWnca.mf index 1cfc649c9f..f9cb91d96d 100644 --- a/usr/src/pkg/manifests/SUNWnca.mf +++ b/usr/src/pkg/manifests/SUNWnca.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnca@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/http-cache-accelerator@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWndmp.mf b/usr/src/pkg/manifests/SUNWndmp.mf index 615c71d9fb..47b777fc8c 100644 --- a/usr/src/pkg/manifests/SUNWndmp.mf +++ b/usr/src/pkg/manifests/SUNWndmp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWndmp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/storage/ndmp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnetcat.mf b/usr/src/pkg/manifests/SUNWnetcat.mf index 9de8969737..924214cc07 100644 --- a/usr/src/pkg/manifests/SUNWnetcat.mf +++ b/usr/src/pkg/manifests/SUNWnetcat.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnetcat@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/netcat@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnfsc.mf b/usr/src/pkg/manifests/SUNWnfsc.mf index 62a2c9feb8..7de23dfacf 100644 --- a/usr/src/pkg/manifests/SUNWnfsc.mf +++ b/usr/src/pkg/manifests/SUNWnfsc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnfsc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/nfs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnfsckr.mf b/usr/src/pkg/manifests/SUNWnfsckr.mf index 79ca85da44..5e2f953198 100644 --- a/usr/src/pkg/manifests/SUNWnfsckr.mf +++ b/usr/src/pkg/manifests/SUNWnfsckr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnfsckr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWnfsc type=require diff --git a/usr/src/pkg/manifests/SUNWnfss.mf b/usr/src/pkg/manifests/SUNWnfss.mf index 48c0ce955d..686d55492b 100644 --- a/usr/src/pkg/manifests/SUNWnfss.mf +++ b/usr/src/pkg/manifests/SUNWnfss.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnfss@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/file-system/nfs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnfsskr.mf b/usr/src/pkg/manifests/SUNWnfsskr.mf index edc7ccaaf1..2ac833915b 100644 --- a/usr/src/pkg/manifests/SUNWnfsskr.mf +++ b/usr/src/pkg/manifests/SUNWnfsskr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnfsskr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWnfss type=require diff --git a/usr/src/pkg/manifests/SUNWnge.mf b/usr/src/pkg/manifests/SUNWnge.mf index 67e9bf2f54..5af5e6cbaa 100644 --- a/usr/src/pkg/manifests/SUNWnge.mf +++ b/usr/src/pkg/manifests/SUNWnge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/nge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnis.mf b/usr/src/pkg/manifests/SUNWnis.mf index 190d21c48f..abf9eb1499 100644 --- a/usr/src/pkg/manifests/SUNWnis.mf +++ b/usr/src/pkg/manifests/SUNWnis.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnis@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/nis@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWniumx.mf b/usr/src/pkg/manifests/SUNWniumx.mf index feb3160861..fb0070528f 100644 --- a/usr/src/pkg/manifests/SUNWniumx.mf +++ b/usr/src/pkg/manifests/SUNWniumx.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWniumx@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/niumx@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWntfsprogs.mf b/usr/src/pkg/manifests/SUNWntfsprogs.mf index 9d1d596edc..ba1854b6cb 100644 --- a/usr/src/pkg/manifests/SUNWntfsprogs.mf +++ b/usr/src/pkg/manifests/SUNWntfsprogs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWntfsprogs@2.0.0,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/ntfsprogs@2.0.0,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWntxn.mf b/usr/src/pkg/manifests/SUNWntxn.mf index 18ec3cc6c4..508bf9be96 100644 --- a/usr/src/pkg/manifests/SUNWntxn.mf +++ b/usr/src/pkg/manifests/SUNWntxn.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWntxn@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ntxn@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnvsata.mf b/usr/src/pkg/manifests/SUNWnvsata.mf index b1e44b7102..73af75069e 100644 --- a/usr/src/pkg/manifests/SUNWnvsata.mf +++ b/usr/src/pkg/manifests/SUNWnvsata.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnvsata@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/nv_sata@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWnxge.mf b/usr/src/pkg/manifests/SUNWnxge.mf index 8637c710cb..f4f25feef2 100644 --- a/usr/src/pkg/manifests/SUNWnxge.mf +++ b/usr/src/pkg/manifests/SUNWnxge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWnxge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/nxge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWonbld.mf b/usr/src/pkg/manifests/SUNWonbld.mf index 4dc1764d99..9fd551748f 100644 --- a/usr/src/pkg/manifests/SUNWonbld.mf +++ b/usr/src/pkg/manifests/SUNWonbld.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWonbld@0.5.11,5.11-0.133 set name=pkg.renamed value=true +set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/build/onbld@0.5.11,5.11-0.133 type=require -set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/SUNWonfmes.mf b/usr/src/pkg/manifests/SUNWonfmes.mf index fa813ecc9b..3c771ef418 100644 --- a/usr/src/pkg/manifests/SUNWonfmes.mf +++ b/usr/src/pkg/manifests/SUNWonfmes.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWonfmes@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/fault-management/eversholt-utilities@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWonmtst.mf b/usr/src/pkg/manifests/SUNWonmtst.mf index 3cf3cd0295..ab026112a4 100644 --- a/usr/src/pkg/manifests/SUNWonmtst.mf +++ b/usr/src/pkg/manifests/SUNWonmtst.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWonmtst@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=internal set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/fault-management/mtst@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWonzfs.mf b/usr/src/pkg/manifests/SUNWonzfs.mf index a45907ace7..6de0b8b338 100644 --- a/usr/src/pkg/manifests/SUNWonzfs.mf +++ b/usr/src/pkg/manifests/SUNWonzfs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWonzfs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/zfs/tests@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWos86r.mf b/usr/src/pkg/manifests/SUNWos86r.mf index 4e59d5d7fa..ef26f5c21b 100644 --- a/usr/src/pkg/manifests/SUNWos86r.mf +++ b/usr/src/pkg/manifests/SUNWos86r.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWos86r@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/platform@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWosdem.mf b/usr/src/pkg/manifests/SUNWosdem.mf index 41f6c1d5d5..a5ed3a699c 100644 --- a/usr/src/pkg/manifests/SUNWosdem.mf +++ b/usr/src/pkg/manifests/SUNWosdem.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWosdem@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/source/demo/system@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpacket.mf b/usr/src/pkg/manifests/SUNWpacket.mf index e70e923289..d1b8cddac7 100644 --- a/usr/src/pkg/manifests/SUNWpacket.mf +++ b/usr/src/pkg/manifests/SUNWpacket.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpacket@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/bpf@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpapi.mf b/usr/src/pkg/manifests/SUNWpapi.mf index 276b92d3c6..1778fc54af 100644 --- a/usr/src/pkg/manifests/SUNWpapi.mf +++ b/usr/src/pkg/manifests/SUNWpapi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpapi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/library/print/open-printing@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWparted.mf b/usr/src/pkg/manifests/SUNWparted.mf index d918905c9e..2df897251c 100644 --- a/usr/src/pkg/manifests/SUNWparted.mf +++ b/usr/src/pkg/manifests/SUNWparted.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWparted@1.8.8,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/storage/parted@1.8.8,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpc.mf b/usr/src/pkg/manifests/SUNWpc.mf index 9a6b102062..b76cbffcb2 100644 --- a/usr/src/pkg/manifests/SUNWpc.mf +++ b/usr/src/pkg/manifests/SUNWpc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp/print-client-commands@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpcan.mf b/usr/src/pkg/manifests/SUNWpcan.mf index bb1fe31ba5..5d5ef8a789 100644 --- a/usr/src/pkg/manifests/SUNWpcan.mf +++ b/usr/src/pkg/manifests/SUNWpcan.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcan@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/pcan@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpcelx.mf b/usr/src/pkg/manifests/SUNWpcelx.mf index 0ff8bad5dc..33e8486edf 100644 --- a/usr/src/pkg/manifests/SUNWpcelx.mf +++ b/usr/src/pkg/manifests/SUNWpcelx.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcelx@0.5.11,5.11-0.132 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWpcmci.mf b/usr/src/pkg/manifests/SUNWpcmci.mf index 73f87821cb..b934a8c235 100644 --- a/usr/src/pkg/manifests/SUNWpcmci.mf +++ b/usr/src/pkg/manifests/SUNWpcmci.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcmci@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/pcmcia@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpcmcu.mf b/usr/src/pkg/manifests/SUNWpcmcu.mf index e93ad893ce..7161403066 100644 --- a/usr/src/pkg/manifests/SUNWpcmcu.mf +++ b/usr/src/pkg/manifests/SUNWpcmcu.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcmcu@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWpcmem.mf b/usr/src/pkg/manifests/SUNWpcmem.mf index b4affa4410..4b6e6fcdae 100644 --- a/usr/src/pkg/manifests/SUNWpcmem.mf +++ b/usr/src/pkg/manifests/SUNWpcmem.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcmem@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWpcser.mf b/usr/src/pkg/manifests/SUNWpcser.mf index 6b4840e11c..38b59f1cc0 100644 --- a/usr/src/pkg/manifests/SUNWpcser.mf +++ b/usr/src/pkg/manifests/SUNWpcser.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcser@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/pcser@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpcwl.mf b/usr/src/pkg/manifests/SUNWpcwl.mf index f963d99a7d..45b664d0e6 100644 --- a/usr/src/pkg/manifests/SUNWpcwl.mf +++ b/usr/src/pkg/manifests/SUNWpcwl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpcwl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/pcwl@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpd.mf b/usr/src/pkg/manifests/SUNWpd.mf index 24b91cdb31..f3fa7d13bf 100644 --- a/usr/src/pkg/manifests/SUNWpd.mf +++ b/usr/src/pkg/manifests/SUNWpd.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # Renamed in 133. set name=pkg.fmri value=pkg:/SUNWpd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(sparc_ONLY)depend fmri=pkg:/driver/sparc/platform type=require $(i386_ONLY)depend fmri=pkg:/driver/storage/glm type=require diff --git a/usr/src/pkg/manifests/SUNWpdu.mf b/usr/src/pkg/manifests/SUNWpdu.mf index d3831572e9..925c89e2a1 100644 --- a/usr/src/pkg/manifests/SUNWpdu.mf +++ b/usr/src/pkg/manifests/SUNWpdu.mf @@ -26,4 +26,3 @@ set name=pkg.fmri value=pkg:/SUNWpdu@0.5.11,5.11-0.142 set name=pkg.obsolete value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWperl584core.mf b/usr/src/pkg/manifests/SUNWperl584core.mf index f8c2df8453..c2ea18888a 100644 --- a/usr/src/pkg/manifests/SUNWperl584core.mf +++ b/usr/src/pkg/manifests/SUNWperl584core.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWperl584core@5.8.4,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/runtime/perl-584@5.8.4,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWperl584usr.mf b/usr/src/pkg/manifests/SUNWperl584usr.mf index f04585d3fb..bbd3062db4 100644 --- a/usr/src/pkg/manifests/SUNWperl584usr.mf +++ b/usr/src/pkg/manifests/SUNWperl584usr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWperl584usr@5.8.4,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/runtime/perl-584/extra@5.8.4,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpicl.mf b/usr/src/pkg/manifests/SUNWpicl.mf index 5f3dc7c481..c1eba3f290 100644 --- a/usr/src/pkg/manifests/SUNWpicl.mf +++ b/usr/src/pkg/manifests/SUNWpicl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpicl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/picl@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpiclh.mf b/usr/src/pkg/manifests/SUNWpiclh.mf index 280091cc78..f21ca2e061 100644 --- a/usr/src/pkg/manifests/SUNWpiclh.mf +++ b/usr/src/pkg/manifests/SUNWpiclh.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpiclh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-picl@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpkgcmds.mf b/usr/src/pkg/manifests/SUNWpkgcmds.mf index ef6afdc1f7..bfab1fec4d 100644 --- a/usr/src/pkg/manifests/SUNWpkgcmds.mf +++ b/usr/src/pkg/manifests/SUNWpkgcmds.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpkgcmds@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/package/svr4@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpl5p.mf b/usr/src/pkg/manifests/SUNWpl5p.mf index 4ae4a7c71d..3b607a48d2 100644 --- a/usr/src/pkg/manifests/SUNWpl5p.mf +++ b/usr/src/pkg/manifests/SUNWpl5p.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpl5p@5.6.1,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWpl5u.mf b/usr/src/pkg/manifests/SUNWpl5u.mf index 329c4266c4..5f49459d05 100644 --- a/usr/src/pkg/manifests/SUNWpl5u.mf +++ b/usr/src/pkg/manifests/SUNWpl5u.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpl5u@5.6.1,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWpl5v.mf b/usr/src/pkg/manifests/SUNWpl5v.mf index ad8713e906..e7431d12d9 100644 --- a/usr/src/pkg/manifests/SUNWpl5v.mf +++ b/usr/src/pkg/manifests/SUNWpl5v.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpl5v@5.6.1,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWpm.mf b/usr/src/pkg/manifests/SUNWpm.mf index 3364f7edd1..b59bdb8fce 100644 --- a/usr/src/pkg/manifests/SUNWpm.mf +++ b/usr/src/pkg/manifests/SUNWpm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/power@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpmcs.mf b/usr/src/pkg/manifests/SUNWpmcs.mf index 46febe046b..e77f10b118 100644 --- a/usr/src/pkg/manifests/SUNWpmcs.mf +++ b/usr/src/pkg/manifests/SUNWpmcs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpmcs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/pmcs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpolkit.mf b/usr/src/pkg/manifests/SUNWpolkit.mf index 7e64e4f746..b68a458fbf 100644 --- a/usr/src/pkg/manifests/SUNWpolkit.mf +++ b/usr/src/pkg/manifests/SUNWpolkit.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpolkit@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/policykit@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpool.mf b/usr/src/pkg/manifests/SUNWpool.mf index ea4d6470f1..dcc97bcaab 100644 --- a/usr/src/pkg/manifests/SUNWpool.mf +++ b/usr/src/pkg/manifests/SUNWpool.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpool@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/resource-pools@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpoold.mf b/usr/src/pkg/manifests/SUNWpoold.mf index b513da1209..315ed4b7b3 100644 --- a/usr/src/pkg/manifests/SUNWpoold.mf +++ b/usr/src/pkg/manifests/SUNWpoold.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpoold@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/resource-pools/poold@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpowertop.mf b/usr/src/pkg/manifests/SUNWpowertop.mf index f4d2b09beb..5d091d015e 100644 --- a/usr/src/pkg/manifests/SUNWpowertop.mf +++ b/usr/src/pkg/manifests/SUNWpowertop.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpowertop@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/diagnostic/powertop@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWppm.mf b/usr/src/pkg/manifests/SUNWppm.mf index f5eae41b53..edd4f8f9b2 100644 --- a/usr/src/pkg/manifests/SUNWppm.mf +++ b/usr/src/pkg/manifests/SUNWppm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWppm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp/print-manager/legacy@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpppd.mf b/usr/src/pkg/manifests/SUNWpppd.mf index 1238b2653c..49bd5cfd8d 100644 --- a/usr/src/pkg/manifests/SUNWpppd.mf +++ b/usr/src/pkg/manifests/SUNWpppd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpppd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/ppp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpppdt.mf b/usr/src/pkg/manifests/SUNWpppdt.mf index 145ad67e0c..6443dcc136 100644 --- a/usr/src/pkg/manifests/SUNWpppdt.mf +++ b/usr/src/pkg/manifests/SUNWpppdt.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpppdt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/ppp/tunnel@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpppg.mf b/usr/src/pkg/manifests/SUNWpppg.mf index 4f47e2067c..621dea8c17 100644 --- a/usr/src/pkg/manifests/SUNWpppg.mf +++ b/usr/src/pkg/manifests/SUNWpppg.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpppg@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/ppp/pppdump@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpppgS.mf b/usr/src/pkg/manifests/SUNWpppgS.mf index 4f54c3ea77..5d35d24da5 100644 --- a/usr/src/pkg/manifests/SUNWpppgS.mf +++ b/usr/src/pkg/manifests/SUNWpppgS.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpppgS@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/source/network/pppdump@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWps.mf b/usr/src/pkg/manifests/SUNWps.mf index 41964d851c..1b6a424bf6 100644 --- a/usr/src/pkg/manifests/SUNWps.mf +++ b/usr/src/pkg/manifests/SUNWps.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWps@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpsdcr.mf b/usr/src/pkg/manifests/SUNWpsdcr.mf index 7c6b8f3cf4..b22bd29d99 100644 --- a/usr/src/pkg/manifests/SUNWpsdcr.mf +++ b/usr/src/pkg/manifests/SUNWpsdcr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsdcr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/i86pc/platform@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpsdir.mf b/usr/src/pkg/manifests/SUNWpsdir.mf index 7322edf18a..d6f636b996 100644 --- a/usr/src/pkg/manifests/SUNWpsdir.mf +++ b/usr/src/pkg/manifests/SUNWpsdir.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsdir@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/ata@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpsdpr.mf b/usr/src/pkg/manifests/SUNWpsdpr.mf index 86ca953191..54ca3f580f 100644 --- a/usr/src/pkg/manifests/SUNWpsdpr.mf +++ b/usr/src/pkg/manifests/SUNWpsdpr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsdpr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/pcata@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpsf.mf b/usr/src/pkg/manifests/SUNWpsf.mf index bbfca29f2e..8f9ea7b2be 100644 --- a/usr/src/pkg/manifests/SUNWpsf.mf +++ b/usr/src/pkg/manifests/SUNWpsf.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsf@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp/filter/postscript-lp-filter@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWpsh.mf b/usr/src/pkg/manifests/SUNWpsh.mf index aa9d3c1ed6..93e48eb1da 100644 --- a/usr/src/pkg/manifests/SUNWpsh.mf +++ b/usr/src/pkg/manifests/SUNWpsh.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-storage@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWpsm-ipp.mf b/usr/src/pkg/manifests/SUNWpsm-ipp.mf index 35ac8766c8..db836cec2d 100644 --- a/usr/src/pkg/manifests/SUNWpsm-ipp.mf +++ b/usr/src/pkg/manifests/SUNWpsm-ipp.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsm-ipp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/library/print/open-printing/ipp@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/library/print/open-printing/ipp@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWpsm-lpd.mf b/usr/src/pkg/manifests/SUNWpsm-lpd.mf index 934075c9ce..80c9531a42 100644 --- a/usr/src/pkg/manifests/SUNWpsm-lpd.mf +++ b/usr/src/pkg/manifests/SUNWpsm-lpd.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpsm-lpd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/library/print/open-printing/lpd@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/library/print/open-printing/lpd@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWpstl.mf b/usr/src/pkg/manifests/SUNWpstl.mf index aa566480c0..9339869345 100644 --- a/usr/src/pkg/manifests/SUNWpstl.mf +++ b/usr/src/pkg/manifests/SUNWpstl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWpstl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/apptrace/platform@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWqfed.mf b/usr/src/pkg/manifests/SUNWqfed.mf index aed8515b61..5b7535602a 100644 --- a/usr/src/pkg/manifests/SUNWqfed.mf +++ b/usr/src/pkg/manifests/SUNWqfed.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWqfed@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/qfe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWqlc.mf b/usr/src/pkg/manifests/SUNWqlc.mf index f7ca02d7b2..d6fadf2f5f 100644 --- a/usr/src/pkg/manifests/SUNWqlc.mf +++ b/usr/src/pkg/manifests/SUNWqlc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWqlc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/qlc@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWqlcu.mf b/usr/src/pkg/manifests/SUNWqlcu.mf index 4559959c7b..31fca76513 100644 --- a/usr/src/pkg/manifests/SUNWqlcu.mf +++ b/usr/src/pkg/manifests/SUNWqlcu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWqlcu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/qlc/qlc-mdb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWqos.mf b/usr/src/pkg/manifests/SUNWqos.mf index 5050a7439c..4923b1a31c 100644 --- a/usr/src/pkg/manifests/SUNWqos.mf +++ b/usr/src/pkg/manifests/SUNWqos.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWqos@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/ipqos/ipqos-config@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWqosu.mf b/usr/src/pkg/manifests/SUNWqosu.mf index 31e32cbaa2..c834cd9097 100644 --- a/usr/src/pkg/manifests/SUNWqosu.mf +++ b/usr/src/pkg/manifests/SUNWqosu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWqosu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/ipqos@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWqus.mf b/usr/src/pkg/manifests/SUNWqus.mf index 50f454c16a..5b7b8b4086 100644 --- a/usr/src/pkg/manifests/SUNWqus.mf +++ b/usr/src/pkg/manifests/SUNWqus.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWqus@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/qus@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWralink.mf b/usr/src/pkg/manifests/SUNWralink.mf index 91df975299..b7f63ad198 100644 --- a/usr/src/pkg/manifests/SUNWralink.mf +++ b/usr/src/pkg/manifests/SUNWralink.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWralink@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ral@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrcap.mf b/usr/src/pkg/manifests/SUNWrcap.mf index 653df19400..91f199a6a3 100644 --- a/usr/src/pkg/manifests/SUNWrcap.mf +++ b/usr/src/pkg/manifests/SUNWrcap.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrcap@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/resource-cap@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrcmdc.mf b/usr/src/pkg/manifests/SUNWrcmdc.mf index ab2797edf5..31985e0f29 100644 --- a/usr/src/pkg/manifests/SUNWrcmdc.mf +++ b/usr/src/pkg/manifests/SUNWrcmdc.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrcmdc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/service/network/network-clients@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/service/network/network-clients@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWrcmds.mf b/usr/src/pkg/manifests/SUNWrcmds.mf index 5586b8582d..47e292c317 100644 --- a/usr/src/pkg/manifests/SUNWrcmds.mf +++ b/usr/src/pkg/manifests/SUNWrcmds.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrcmds@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/service/network/network-servers@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/service/network/network-servers@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWrdc.mf b/usr/src/pkg/manifests/SUNWrdc.mf index 3170737765..306f1b0cb9 100644 --- a/usr/src/pkg/manifests/SUNWrdc.mf +++ b/usr/src/pkg/manifests/SUNWrdc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrdc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/avs/remote-mirror@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrds.mf b/usr/src/pkg/manifests/SUNWrds.mf index 010997dcde..a544ee3c1f 100644 --- a/usr/src/pkg/manifests/SUNWrds.mf +++ b/usr/src/pkg/manifests/SUNWrds.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrds@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rds@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrge.mf b/usr/src/pkg/manifests/SUNWrge.mf index e04282c9e6..4c709a3fad 100644 --- a/usr/src/pkg/manifests/SUNWrge.mf +++ b/usr/src/pkg/manifests/SUNWrge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrmod.mf b/usr/src/pkg/manifests/SUNWrmod.mf index b4107b7ecb..36c15da7dc 100644 --- a/usr/src/pkg/manifests/SUNWrmod.mf +++ b/usr/src/pkg/manifests/SUNWrmod.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrmod@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/boot/real-mode@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrmodr.mf b/usr/src/pkg/manifests/SUNWrmodr.mf index 8f5962daa1..9dd0f02bdf 100644 --- a/usr/src/pkg/manifests/SUNWrmodr.mf +++ b/usr/src/pkg/manifests/SUNWrmodr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrmodr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWrmod type=require diff --git a/usr/src/pkg/manifests/SUNWrmodu.mf b/usr/src/pkg/manifests/SUNWrmodu.mf index 472d889403..d1314bb2b0 100644 --- a/usr/src/pkg/manifests/SUNWrmodu.mf +++ b/usr/src/pkg/manifests/SUNWrmodu.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrmodu@0.5.11,5.11-0.133 @@ -31,5 +30,4 @@ set name=pkg.fmri value=pkg:/SUNWrmodu@0.5.11,5.11-0.133 # one variant and rename the other, so we rename both to SUNrmod. set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=system/boot/real-mode type=require diff --git a/usr/src/pkg/manifests/SUNWrmvolmgr.mf b/usr/src/pkg/manifests/SUNWrmvolmgr.mf index 94fa620dd3..19f28c2680 100644 --- a/usr/src/pkg/manifests/SUNWrmvolmgr.mf +++ b/usr/src/pkg/manifests/SUNWrmvolmgr.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrmvolmgr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/storage/media-volume-manager@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWrmwb.mf b/usr/src/pkg/manifests/SUNWrmwb.mf index e06ce9c87b..8b0300dd5f 100644 --- a/usr/src/pkg/manifests/SUNWrmwb.mf +++ b/usr/src/pkg/manifests/SUNWrmwb.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrmwb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/management/wbem/resource-management@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWroute.mf b/usr/src/pkg/manifests/SUNWroute.mf index 12bdbb1345..e117fab7bf 100644 --- a/usr/src/pkg/manifests/SUNWroute.mf +++ b/usr/src/pkg/manifests/SUNWroute.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWroute@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/routing@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrpcib.mf b/usr/src/pkg/manifests/SUNWrpcib.mf index 1e38052f76..ad474a35d2 100644 --- a/usr/src/pkg/manifests/SUNWrpcib.mf +++ b/usr/src/pkg/manifests/SUNWrpcib.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrpcib@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rpcib@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrsg.mf b/usr/src/pkg/manifests/SUNWrsg.mf index 3f327cc49e..a24ba34c67 100644 --- a/usr/src/pkg/manifests/SUNWrsg.mf +++ b/usr/src/pkg/manifests/SUNWrsg.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrsg@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/security/rpcsec@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrsgk.mf b/usr/src/pkg/manifests/SUNWrsgk.mf index d8fc338363..683e1c475a 100644 --- a/usr/src/pkg/manifests/SUNWrsgk.mf +++ b/usr/src/pkg/manifests/SUNWrsgk.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrsgk@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/secure-rpc@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrsm.mf b/usr/src/pkg/manifests/SUNWrsm.mf index b04d465326..9a699a81c0 100644 --- a/usr/src/pkg/manifests/SUNWrsm.mf +++ b/usr/src/pkg/manifests/SUNWrsm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrsm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/remote-shared-memory@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrsmo.mf b/usr/src/pkg/manifests/SUNWrsmo.mf index 779b78431c..8e09d146e8 100644 --- a/usr/src/pkg/manifests/SUNWrsmo.mf +++ b/usr/src/pkg/manifests/SUNWrsmo.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrsmo@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/rsmops@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrtls.mf b/usr/src/pkg/manifests/SUNWrtls.mf index 83bc4fefde..f248fced2b 100644 --- a/usr/src/pkg/manifests/SUNWrtls.mf +++ b/usr/src/pkg/manifests/SUNWrtls.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrtls@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rtls@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrtw.mf b/usr/src/pkg/manifests/SUNWrtw.mf index bb10a4ee8e..f39e40d6a2 100644 --- a/usr/src/pkg/manifests/SUNWrtw.mf +++ b/usr/src/pkg/manifests/SUNWrtw.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrtw@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rtw@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrum.mf b/usr/src/pkg/manifests/SUNWrum.mf index b8c26b5d32..f3cdd2168b 100644 --- a/usr/src/pkg/manifests/SUNWrum.mf +++ b/usr/src/pkg/manifests/SUNWrum.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrum@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rum@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrwd.mf b/usr/src/pkg/manifests/SUNWrwd.mf index 7b922824e2..189fd37ea4 100644 --- a/usr/src/pkg/manifests/SUNWrwd.mf +++ b/usr/src/pkg/manifests/SUNWrwd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrwd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rwd@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWrwn.mf b/usr/src/pkg/manifests/SUNWrwn.mf index 6aa903937a..6d983c3009 100644 --- a/usr/src/pkg/manifests/SUNWrwn.mf +++ b/usr/src/pkg/manifests/SUNWrwn.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWrwn@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/rwn@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWs10brand.mf b/usr/src/pkg/manifests/SUNWs10brand.mf index 7c496b6dfe..ae8dd145c6 100644 --- a/usr/src/pkg/manifests/SUNWs10brand.mf +++ b/usr/src/pkg/manifests/SUNWs10brand.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWs10brand@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/zones/brand/s10@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsacom.mf b/usr/src/pkg/manifests/SUNWsacom.mf index 08e7cbf1d0..0ca33ce331 100644 --- a/usr/src/pkg/manifests/SUNWsacom.mf +++ b/usr/src/pkg/manifests/SUNWsacom.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsacom@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/management/snmp/sea/sea-config@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWsasnm.mf b/usr/src/pkg/manifests/SUNWsasnm.mf index 9aebf7efc7..25a79aec7e 100644 --- a/usr/src/pkg/manifests/SUNWsasnm.mf +++ b/usr/src/pkg/manifests/SUNWsasnm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsasnm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/management/snmp/sea@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsbp2.mf b/usr/src/pkg/manifests/SUNWsbp2.mf index 18ac74a6b2..011036ed2a 100644 --- a/usr/src/pkg/manifests/SUNWsbp2.mf +++ b/usr/src/pkg/manifests/SUNWsbp2.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsbp2@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/sbp2@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsckm.mf b/usr/src/pkg/manifests/SUNWsckm.mf index f1dcc3ed52..5a31de91fc 100644 --- a/usr/src/pkg/manifests/SUNWsckm.mf +++ b/usr/src/pkg/manifests/SUNWsckm.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsckm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/key-management/sun-fire-15000@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWscm.mf b/usr/src/pkg/manifests/SUNWscm.mf index 00439b5208..7f77f69a39 100644 --- a/usr/src/pkg/manifests/SUNWscm.mf +++ b/usr/src/pkg/manifests/SUNWscm.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWscm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/storage/avs/cache-management@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWscp.mf b/usr/src/pkg/manifests/SUNWscp.mf index 3b7f8d9df4..b1e873f55d 100644 --- a/usr/src/pkg/manifests/SUNWscp.mf +++ b/usr/src/pkg/manifests/SUNWscp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWscp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/compatibility/ucb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWscplp.mf b/usr/src/pkg/manifests/SUNWscplp.mf index c58930cc02..f3d77b01e6 100644 --- a/usr/src/pkg/manifests/SUNWscplp.mf +++ b/usr/src/pkg/manifests/SUNWscplp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWscplp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/print/lp/compatibility/sunos4@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWscsa1394.mf b/usr/src/pkg/manifests/SUNWscsa1394.mf index 1bdd06f8f8..a00e85bcbd 100644 --- a/usr/src/pkg/manifests/SUNWscsa1394.mf +++ b/usr/src/pkg/manifests/SUNWscsa1394.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWscsa1394@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/scsa1394@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWscsip.mf b/usr/src/pkg/manifests/SUNWscsip.mf index dd578eac10..7021da5af5 100644 --- a/usr/src/pkg/manifests/SUNWscsip.mf +++ b/usr/src/pkg/manifests/SUNWscsip.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWscsip@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/storage/scsi-plugin@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWsdcard.mf b/usr/src/pkg/manifests/SUNWsdcard.mf index 285faeb74e..23b4938b4d 100644 --- a/usr/src/pkg/manifests/SUNWsdcard.mf +++ b/usr/src/pkg/manifests/SUNWsdcard.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsdcard@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/sdcard@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWses.mf b/usr/src/pkg/manifests/SUNWses.mf index 8433c2e6fd..92230cf57b 100644 --- a/usr/src/pkg/manifests/SUNWses.mf +++ b/usr/src/pkg/manifests/SUNWses.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWses@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/ses@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsfdr.mf b/usr/src/pkg/manifests/SUNWsfdr.mf index 35f16d26bb..502e7e1849 100644 --- a/usr/src/pkg/manifests/SUNWsfdr.mf +++ b/usr/src/pkg/manifests/SUNWsfdr.mf @@ -20,14 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsfdr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend \ fmri=pkg:/system/kernel/dynamic-reconfiguration/sun-fire-880@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWsfe.mf b/usr/src/pkg/manifests/SUNWsfe.mf index 13102fa47b..837b98b560 100644 --- a/usr/src/pkg/manifests/SUNWsfe.mf +++ b/usr/src/pkg/manifests/SUNWsfe.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsfe@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/sfe@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsi3124.mf b/usr/src/pkg/manifests/SUNWsi3124.mf index c6fc9359a5..07f67ede7c 100644 --- a/usr/src/pkg/manifests/SUNWsi3124.mf +++ b/usr/src/pkg/manifests/SUNWsi3124.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsi3124@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/si3124@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWslp.mf b/usr/src/pkg/manifests/SUNWslp.mf index b401f2d37a..f6bb94ff7c 100644 --- a/usr/src/pkg/manifests/SUNWslp.mf +++ b/usr/src/pkg/manifests/SUNWslp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWslp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/slp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsmapi.mf b/usr/src/pkg/manifests/SUNWsmapi.mf index 86b26e4dd8..e0e506d40e 100644 --- a/usr/src/pkg/manifests/SUNWsmapi.mf +++ b/usr/src/pkg/manifests/SUNWsmapi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmapi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/libdiskmgt@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsmbfs.mf b/usr/src/pkg/manifests/SUNWsmbfs.mf index 3134547f0f..7c63af1425 100644 --- a/usr/src/pkg/manifests/SUNWsmbfs.mf +++ b/usr/src/pkg/manifests/SUNWsmbfs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmbfs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/smb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsmbfskr.mf b/usr/src/pkg/manifests/SUNWsmbfskr.mf index a7b2b6d6f7..fd7d06811d 100644 --- a/usr/src/pkg/manifests/SUNWsmbfskr.mf +++ b/usr/src/pkg/manifests/SUNWsmbfskr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmbfskr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWsmbfs type=require diff --git a/usr/src/pkg/manifests/SUNWsmbs.mf b/usr/src/pkg/manifests/SUNWsmbs.mf index 81805f147e..96c6f03d8e 100644 --- a/usr/src/pkg/manifests/SUNWsmbs.mf +++ b/usr/src/pkg/manifests/SUNWsmbs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmbs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/file-system/smb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsmbskr.mf b/usr/src/pkg/manifests/SUNWsmbskr.mf index a956dfb816..379773ebd7 100644 --- a/usr/src/pkg/manifests/SUNWsmbskr.mf +++ b/usr/src/pkg/manifests/SUNWsmbskr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmbskr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWsmbs type=require diff --git a/usr/src/pkg/manifests/SUNWsmedia.mf b/usr/src/pkg/manifests/SUNWsmedia.mf index cc33df0ed8..f6bdff0588 100644 --- a/usr/src/pkg/manifests/SUNWsmedia.mf +++ b/usr/src/pkg/manifests/SUNWsmedia.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmedia@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/service/storage/removable-media@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/service/storage/removable-media@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWsmhba.mf b/usr/src/pkg/manifests/SUNWsmhba.mf index 5705bcc0cd..63b228b008 100644 --- a/usr/src/pkg/manifests/SUNWsmhba.mf +++ b/usr/src/pkg/manifests/SUNWsmhba.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmhba@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/storage/sasinfo@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsmpd.mf b/usr/src/pkg/manifests/SUNWsmpd.mf index 1d6629eb3c..5f344a949a 100644 --- a/usr/src/pkg/manifests/SUNWsmpd.mf +++ b/usr/src/pkg/manifests/SUNWsmpd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsmpd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/smp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsn1int.mf b/usr/src/pkg/manifests/SUNWsn1int.mf index 50faa73130..1cc64ecca2 100644 --- a/usr/src/pkg/manifests/SUNWsn1int.mf +++ b/usr/src/pkg/manifests/SUNWsn1int.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsn1int@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/zones/brand/sn1@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsndm.mf b/usr/src/pkg/manifests/SUNWsndm.mf index 044bb9f8bb..88a6f94238 100644 --- a/usr/src/pkg/manifests/SUNWsndm.mf +++ b/usr/src/pkg/manifests/SUNWsndm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsndm@8.14.4,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/smtp/sendmail@8.14.4,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWspnego.mf b/usr/src/pkg/manifests/SUNWspnego.mf index 9f0a107911..1ff6257777 100644 --- a/usr/src/pkg/manifests/SUNWspnego.mf +++ b/usr/src/pkg/manifests/SUNWspnego.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWspnego@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/security/gss/spnego@0.5.11,5.11-0.133 \ type=require diff --git a/usr/src/pkg/manifests/SUNWspsv.mf b/usr/src/pkg/manifests/SUNWspsv.mf index 564173ee99..d3f8c0814f 100644 --- a/usr/src/pkg/manifests/SUNWspsv.mf +++ b/usr/src/pkg/manifests/SUNWspsv.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWspsv@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/sv@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWspwr.mf b/usr/src/pkg/manifests/SUNWspwr.mf index 6b8974606d..f69dcc48bf 100644 --- a/usr/src/pkg/manifests/SUNWspwr.mf +++ b/usr/src/pkg/manifests/SUNWspwr.mf @@ -29,4 +29,3 @@ set name=pkg.fmri value=pkg:/SUNWspwr@0.5.11,5.11-0.141 set name=pkg.obsolete value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWsra.mf b/usr/src/pkg/manifests/SUNWsra.mf index ecd0a2b2fa..0300fdc2d6 100644 --- a/usr/src/pkg/manifests/SUNWsra.mf +++ b/usr/src/pkg/manifests/SUNWsra.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsra@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWsrh.mf b/usr/src/pkg/manifests/SUNWsrh.mf index 9bcdcb8bb7..6ca3f911c1 100644 --- a/usr/src/pkg/manifests/SUNWsrh.mf +++ b/usr/src/pkg/manifests/SUNWsrh.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsrh@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWsrpt.mf b/usr/src/pkg/manifests/SUNWsrpt.mf index 4c33fa9614..1f51cab1fe 100644 --- a/usr/src/pkg/manifests/SUNWsrpt.mf +++ b/usr/src/pkg/manifests/SUNWsrpt.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsrpt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/srpt@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWssad.mf b/usr/src/pkg/manifests/SUNWssad.mf index 0a8137b668..78ea29a3b1 100644 --- a/usr/src/pkg/manifests/SUNWssad.mf +++ b/usr/src/pkg/manifests/SUNWssad.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWssad@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/storage/ssd@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWssh.mf b/usr/src/pkg/manifests/SUNWssh.mf index 285883c1f5..51e1342e53 100644 --- a/usr/src/pkg/manifests/SUNWssh.mf +++ b/usr/src/pkg/manifests/SUNWssh.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWssh@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/ssh@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsshcu.mf b/usr/src/pkg/manifests/SUNWsshcu.mf index 174ad2a2a5..56f9987ec2 100644 --- a/usr/src/pkg/manifests/SUNWsshcu.mf +++ b/usr/src/pkg/manifests/SUNWsshcu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsshcu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/ssh/ssh-key@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsshd.mf b/usr/src/pkg/manifests/SUNWsshd.mf index 9875f903b1..352cfa4492 100644 --- a/usr/src/pkg/manifests/SUNWsshd.mf +++ b/usr/src/pkg/manifests/SUNWsshd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsshd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/ssh@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWstc.mf b/usr/src/pkg/manifests/SUNWstc.mf index 9313043da8..276f058384 100644 --- a/usr/src/pkg/manifests/SUNWstc.mf +++ b/usr/src/pkg/manifests/SUNWstc.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWstc@0.5.11,5.11-0.133 set name=pkg.obsolete value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWstmf.mf b/usr/src/pkg/manifests/SUNWstmf.mf index 7418b54abd..da892f0bef 100644 --- a/usr/src/pkg/manifests/SUNWstmf.mf +++ b/usr/src/pkg/manifests/SUNWstmf.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWstmf@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/iscsi@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWsvvs.mf b/usr/src/pkg/manifests/SUNWsvvs.mf index 3bb54dea41..cbece3c352 100644 --- a/usr/src/pkg/manifests/SUNWsvvs.mf +++ b/usr/src/pkg/manifests/SUNWsvvs.mf @@ -20,13 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWsvvs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=org.opensolaris.redist value=internal set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/tests/svr4@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtavor.mf b/usr/src/pkg/manifests/SUNWtavor.mf index 2b755ba164..8ce22d5c95 100644 --- a/usr/src/pkg/manifests/SUNWtavor.mf +++ b/usr/src/pkg/manifests/SUNWtavor.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtavor@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/tavor@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtcpd.mf b/usr/src/pkg/manifests/SUNWtcpd.mf index 1b6e11ba23..a03e16e6e4 100644 --- a/usr/src/pkg/manifests/SUNWtcpd.mf +++ b/usr/src/pkg/manifests/SUNWtcpd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtcpd@7.6,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/library/security/tcp-wrapper@7.6,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtcpdS.mf b/usr/src/pkg/manifests/SUNWtcpdS.mf index 85f88b6337..5712b74111 100644 --- a/usr/src/pkg/manifests/SUNWtcpdS.mf +++ b/usr/src/pkg/manifests/SUNWtcpdS.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtcpdS@7.6,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/source/security/tcp-wrapper@7.6,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtecla.mf b/usr/src/pkg/manifests/SUNWtecla.mf index e738e9830a..df32c2eec6 100644 --- a/usr/src/pkg/manifests/SUNWtecla.mf +++ b/usr/src/pkg/manifests/SUNWtecla.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtecla@1.6.0,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/library/libtecla@1.6.0,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWter.mf b/usr/src/pkg/manifests/SUNWter.mf index f41dd7b821..c6796355fd 100644 --- a/usr/src/pkg/manifests/SUNWter.mf +++ b/usr/src/pkg/manifests/SUNWter.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWter@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/data/terminfo@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtftp.mf b/usr/src/pkg/manifests/SUNWtftp.mf index 14b71df5d0..95a67881c5 100644 --- a/usr/src/pkg/manifests/SUNWtftp.mf +++ b/usr/src/pkg/manifests/SUNWtftp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtftp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/tftp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtnetc.mf b/usr/src/pkg/manifests/SUNWtnetc.mf index cc0c5d0ad4..ae40490277 100644 --- a/usr/src/pkg/manifests/SUNWtnetc.mf +++ b/usr/src/pkg/manifests/SUNWtnetc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtnetc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/network/telnet@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtnetd.mf b/usr/src/pkg/manifests/SUNWtnetd.mf index c317d4fcce..5afdb4af62 100644 --- a/usr/src/pkg/manifests/SUNWtnetd.mf +++ b/usr/src/pkg/manifests/SUNWtnetd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtnetd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/telnet@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtnfc.mf b/usr/src/pkg/manifests/SUNWtnfc.mf index caf9c5a0fc..2ba63c5555 100644 --- a/usr/src/pkg/manifests/SUNWtnfc.mf +++ b/usr/src/pkg/manifests/SUNWtnfc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtnfc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/tnf@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtnfd.mf b/usr/src/pkg/manifests/SUNWtnfd.mf index 9107a51f18..5450ae3478 100644 --- a/usr/src/pkg/manifests/SUNWtnfd.mf +++ b/usr/src/pkg/manifests/SUNWtnfd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtnfd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/tnf@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtoo.mf b/usr/src/pkg/manifests/SUNWtoo.mf index 972b6d46e2..bb393d1b64 100644 --- a/usr/src/pkg/manifests/SUNWtoo.mf +++ b/usr/src/pkg/manifests/SUNWtoo.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtoo@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/linker@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtpm.mf b/usr/src/pkg/manifests/SUNWtpm.mf index 76e42d3a05..9ab9683d3b 100644 --- a/usr/src/pkg/manifests/SUNWtpm.mf +++ b/usr/src/pkg/manifests/SUNWtpm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtpm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/crypto/tpm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWts.mf b/usr/src/pkg/manifests/SUNWts.mf index 6947fbcad6..9606e7a868 100644 --- a/usr/src/pkg/manifests/SUNWts.mf +++ b/usr/src/pkg/manifests/SUNWts.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWts@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/trusted@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWtsg.mf b/usr/src/pkg/manifests/SUNWtsg.mf index 71ed5f357c..24f2cb89eb 100644 --- a/usr/src/pkg/manifests/SUNWtsg.mf +++ b/usr/src/pkg/manifests/SUNWtsg.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWtsg@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/trusted/global-zone@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWuacm.mf b/usr/src/pkg/manifests/SUNWuacm.mf index 18a245f59e..dde47704ab 100644 --- a/usr/src/pkg/manifests/SUNWuacm.mf +++ b/usr/src/pkg/manifests/SUNWuacm.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuacm@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/usbsacm@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWuath.mf b/usr/src/pkg/manifests/SUNWuath.mf index 842c8860fb..4a5761b707 100644 --- a/usr/src/pkg/manifests/SUNWuath.mf +++ b/usr/src/pkg/manifests/SUNWuath.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuath@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/uath@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWucbt.mf b/usr/src/pkg/manifests/SUNWucbt.mf index 8e7e592943..a5971cea20 100644 --- a/usr/src/pkg/manifests/SUNWucbt.mf +++ b/usr/src/pkg/manifests/SUNWucbt.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWucbt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/developer/apptrace/ucblib@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWudapl.mf b/usr/src/pkg/manifests/SUNWudapl.mf index 20048a2dc2..7ed0a280d3 100644 --- a/usr/src/pkg/manifests/SUNWudapl.mf +++ b/usr/src/pkg/manifests/SUNWudapl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWudapl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/udapl@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWudaplt.mf b/usr/src/pkg/manifests/SUNWudaplt.mf index bf63848341..16e1ca6002 100644 --- a/usr/src/pkg/manifests/SUNWudaplt.mf +++ b/usr/src/pkg/manifests/SUNWudaplt.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWudaplt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/network/udapl/udapl-tavor@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/system/network/udapl/udapl-tavor@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWudf.mf b/usr/src/pkg/manifests/SUNWudf.mf index 9096f5484b..56e8c12c85 100644 --- a/usr/src/pkg/manifests/SUNWudf.mf +++ b/usr/src/pkg/manifests/SUNWudf.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWudf@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/udfs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWuedg.mf b/usr/src/pkg/manifests/SUNWuedg.mf index 24dff48991..3657d319a9 100644 --- a/usr/src/pkg/manifests/SUNWuedg.mf +++ b/usr/src/pkg/manifests/SUNWuedg.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuedg@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/usbser_edge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWuftdi.mf b/usr/src/pkg/manifests/SUNWuftdi.mf index c675f41ca8..4a430a52c5 100644 --- a/usr/src/pkg/manifests/SUNWuftdi.mf +++ b/usr/src/pkg/manifests/SUNWuftdi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuftdi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/usbftdi@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWugen.mf b/usr/src/pkg/manifests/SUNWugen.mf index 104a42941e..9fb999a8a0 100644 --- a/usr/src/pkg/manifests/SUNWugen.mf +++ b/usr/src/pkg/manifests/SUNWugen.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWugen@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/usb/ugen@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWugenu.mf b/usr/src/pkg/manifests/SUNWugenu.mf index 930b82fdd2..5b9a00be54 100644 --- a/usr/src/pkg/manifests/SUNWugenu.mf +++ b/usr/src/pkg/manifests/SUNWugenu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWugenu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-ugen@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWuksp.mf b/usr/src/pkg/manifests/SUNWuksp.mf index 0d6d6f2530..ce3f4bdac4 100644 --- a/usr/src/pkg/manifests/SUNWuksp.mf +++ b/usr/src/pkg/manifests/SUNWuksp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuksp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/usbsksp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWukspfw.mf b/usr/src/pkg/manifests/SUNWukspfw.mf index 672f769339..c08f4433b7 100644 --- a/usr/src/pkg/manifests/SUNWukspfw.mf +++ b/usr/src/pkg/manifests/SUNWukspfw.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWukspfw@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/driver/serial/usbsksp/usbs49_fw@0.5.11,5.11-0.133 type=require +depend fmri=pkg:/driver/serial/usbsksp/usbs49_fw@0.5.11,5.11-0.133 \ + type=require diff --git a/usr/src/pkg/manifests/SUNWuprl.mf b/usr/src/pkg/manifests/SUNWuprl.mf index e961841846..2332feddc5 100644 --- a/usr/src/pkg/manifests/SUNWuprl.mf +++ b/usr/src/pkg/manifests/SUNWuprl.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuprl@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/usbsprl@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWural.mf b/usr/src/pkg/manifests/SUNWural.mf index 4e47f063fc..5cf71beb39 100644 --- a/usr/src/pkg/manifests/SUNWural.mf +++ b/usr/src/pkg/manifests/SUNWural.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWural@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ural@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWurtw.mf b/usr/src/pkg/manifests/SUNWurtw.mf index 8dc43d48c9..ba2fd240cd 100644 --- a/usr/src/pkg/manifests/SUNWurtw.mf +++ b/usr/src/pkg/manifests/SUNWurtw.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWurtw@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/urtw@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWus.mf b/usr/src/pkg/manifests/SUNWus.mf index 4ea1e064b5..1278cef4f9 100644 --- a/usr/src/pkg/manifests/SUNWus.mf +++ b/usr/src/pkg/manifests/SUNWus.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWus@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/cpu/us@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWusb.mf b/usr/src/pkg/manifests/SUNWusb.mf index bd3c4baf6c..4e9cf98e74 100644 --- a/usr/src/pkg/manifests/SUNWusb.mf +++ b/usr/src/pkg/manifests/SUNWusb.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWusb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/usb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWusbs.mf b/usr/src/pkg/manifests/SUNWusbs.mf index e974c767c8..7d28079ab1 100644 --- a/usr/src/pkg/manifests/SUNWusbs.mf +++ b/usr/src/pkg/manifests/SUNWusbs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWusbs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/serial/usbser@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWusbu.mf b/usr/src/pkg/manifests/SUNWusbu.mf index 43e4f2cc14..6d499a97be 100644 --- a/usr/src/pkg/manifests/SUNWusbu.mf +++ b/usr/src/pkg/manifests/SUNWusbu.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWusbu@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/header/header-usb@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWusbvc.mf b/usr/src/pkg/manifests/SUNWusbvc.mf index f630f68f7b..c11fd8f7c6 100644 --- a/usr/src/pkg/manifests/SUNWusbvc.mf +++ b/usr/src/pkg/manifests/SUNWusbvc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWusbvc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/graphics/usbvc@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWust.mf b/usr/src/pkg/manifests/SUNWust.mf index f5134fb8ac..badfcbc4c0 100644 --- a/usr/src/pkg/manifests/SUNWust.mf +++ b/usr/src/pkg/manifests/SUNWust.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWust@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/cpu/sun4v@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWuwb.mf b/usr/src/pkg/manifests/SUNWuwb.mf index 0a5a2b546f..beb94f2096 100644 --- a/usr/src/pkg/manifests/SUNWuwb.mf +++ b/usr/src/pkg/manifests/SUNWuwb.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWuwb@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/kernel/ultra-wideband@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWvia823x.mf b/usr/src/pkg/manifests/SUNWvia823x.mf index b0289c5d6c..dd9f38f9f9 100644 --- a/usr/src/pkg/manifests/SUNWvia823x.mf +++ b/usr/src/pkg/manifests/SUNWvia823x.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWvia823x@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/audio/audiovia823x@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWvr.mf b/usr/src/pkg/manifests/SUNWvr.mf index 1fc22527d6..5bd125e79f 100644 --- a/usr/src/pkg/manifests/SUNWvr.mf +++ b/usr/src/pkg/manifests/SUNWvr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWvr@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/vr@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWvrrp.mf b/usr/src/pkg/manifests/SUNWvrrp.mf index 4e6f126636..8213271ca4 100644 --- a/usr/src/pkg/manifests/SUNWvrrp.mf +++ b/usr/src/pkg/manifests/SUNWvrrp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWvrrp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/routing/vrrp@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWvscan.mf b/usr/src/pkg/manifests/SUNWvscan.mf index 2fec101de8..62849244b5 100644 --- a/usr/src/pkg/manifests/SUNWvscan.mf +++ b/usr/src/pkg/manifests/SUNWvscan.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWvscan@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/storage/virus-scan@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWvscankr.mf b/usr/src/pkg/manifests/SUNWvscankr.mf index 60edc0ae2f..3fb15ef3e8 100644 --- a/usr/src/pkg/manifests/SUNWvscankr.mf +++ b/usr/src/pkg/manifests/SUNWvscankr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWvscankr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWvscan type=require diff --git a/usr/src/pkg/manifests/SUNWwbint.mf b/usr/src/pkg/manifests/SUNWwbint.mf index 2c9f2bec1d..db1adb2e8d 100644 --- a/usr/src/pkg/manifests/SUNWwbint.mf +++ b/usr/src/pkg/manifests/SUNWwbint.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWwbint@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/boot/wanboot/internal@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWwbsd.mf b/usr/src/pkg/manifests/SUNWwbsd.mf index 2b29d1aaf3..bf1b59b389 100644 --- a/usr/src/pkg/manifests/SUNWwbsd.mf +++ b/usr/src/pkg/manifests/SUNWwbsd.mf @@ -20,11 +20,9 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWwbsd@0.5.11,5.11-0.130 set name=pkg.obsolete value=true set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/SUNWwbsup.mf b/usr/src/pkg/manifests/SUNWwbsup.mf index 96936f2fa2..1cf1eb1745 100644 --- a/usr/src/pkg/manifests/SUNWwbsup.mf +++ b/usr/src/pkg/manifests/SUNWwbsup.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWwbsup@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/boot/wanboot@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWwlan.mf b/usr/src/pkg/manifests/SUNWwlan.mf index 2df240e70e..6e983f3106 100644 --- a/usr/src/pkg/manifests/SUNWwlan.mf +++ b/usr/src/pkg/manifests/SUNWwlan.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWwlan@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/network/wificonfig@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWwpa.mf b/usr/src/pkg/manifests/SUNWwpa.mf index 7cbd1f0043..8d5ec4468e 100644 --- a/usr/src/pkg/manifests/SUNWwpa.mf +++ b/usr/src/pkg/manifests/SUNWwpa.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWwpa@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/wpa@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWwpi.mf b/usr/src/pkg/manifests/SUNWwpi.mf index 59e302974e..e933c63dfd 100644 --- a/usr/src/pkg/manifests/SUNWwpi.mf +++ b/usr/src/pkg/manifests/SUNWwpi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWwpi@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/wpi@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxcu4.mf b/usr/src/pkg/manifests/SUNWxcu4.mf index e538866486..2335cba587 100644 --- a/usr/src/pkg/manifests/SUNWxcu4.mf +++ b/usr/src/pkg/manifests/SUNWxcu4.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxcu4@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/xopen/xcu4@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxcu6.mf b/usr/src/pkg/manifests/SUNWxcu6.mf index 733a069fb1..72c13131bb 100644 --- a/usr/src/pkg/manifests/SUNWxcu6.mf +++ b/usr/src/pkg/manifests/SUNWxcu6.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxcu6@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/xopen/xcu6@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxdt.mf b/usr/src/pkg/manifests/SUNWxdt.mf index ebb7bb03f8..ba2f518883 100644 --- a/usr/src/pkg/manifests/SUNWxdt.mf +++ b/usr/src/pkg/manifests/SUNWxdt.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxdt@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/dtrace@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxge.mf b/usr/src/pkg/manifests/SUNWxge.mf index 93c7782ad9..0892f6dd34 100644 --- a/usr/src/pkg/manifests/SUNWxge.mf +++ b/usr/src/pkg/manifests/SUNWxge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/xge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxsvc.mf b/usr/src/pkg/manifests/SUNWxsvc.mf index 34f0115997..4fdd173fea 100644 --- a/usr/src/pkg/manifests/SUNWxsvc.mf +++ b/usr/src/pkg/manifests/SUNWxsvc.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxsvc@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/x11/xsvc@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxvmipa.mf b/usr/src/pkg/manifests/SUNWxvmipa.mf index 84d73ac6a6..481a8c9d25 100644 --- a/usr/src/pkg/manifests/SUNWxvmipa.mf +++ b/usr/src/pkg/manifests/SUNWxvmipa.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxvmipa@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/xvm/ipagent@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxvmpv.mf b/usr/src/pkg/manifests/SUNWxvmpv.mf index c7c601a76b..ba60806c45 100644 --- a/usr/src/pkg/manifests/SUNWxvmpv.mf +++ b/usr/src/pkg/manifests/SUNWxvmpv.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxvmpv@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/xvm/pv@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWxwdv.mf b/usr/src/pkg/manifests/SUNWxwdv.mf index 2262515bed..04132ebb12 100644 --- a/usr/src/pkg/manifests/SUNWxwdv.mf +++ b/usr/src/pkg/manifests/SUNWxwdv.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWxwdv@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/x11/winlock@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWyge.mf b/usr/src/pkg/manifests/SUNWyge.mf index 4fd919909c..b12d18716c 100644 --- a/usr/src/pkg/manifests/SUNWyge.mf +++ b/usr/src/pkg/manifests/SUNWyge.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWyge@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/yge@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWyp.mf b/usr/src/pkg/manifests/SUNWyp.mf index 133e3ecfdc..2eea8deec9 100644 --- a/usr/src/pkg/manifests/SUNWyp.mf +++ b/usr/src/pkg/manifests/SUNWyp.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWyp@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/service/network/nis@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWzfs.mf b/usr/src/pkg/manifests/SUNWzfs.mf index d70162eb57..022e3adb1a 100644 --- a/usr/src/pkg/manifests/SUNWzfs.mf +++ b/usr/src/pkg/manifests/SUNWzfs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWzfs@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/file-system/zfs@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWzfskr.mf b/usr/src/pkg/manifests/SUNWzfskr.mf index 360004c7cd..8f2474b009 100644 --- a/usr/src/pkg/manifests/SUNWzfskr.mf +++ b/usr/src/pkg/manifests/SUNWzfskr.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWzfskr@0.5.11,5.11-0.130 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/SUNWzfs type=require diff --git a/usr/src/pkg/manifests/SUNWzone.mf b/usr/src/pkg/manifests/SUNWzone.mf index 43e8685d09..ea017ffd72 100644 --- a/usr/src/pkg/manifests/SUNWzone.mf +++ b/usr/src/pkg/manifests/SUNWzone.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWzone@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/zones@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWzoneint.mf b/usr/src/pkg/manifests/SUNWzoneint.mf index 399f49c368..88e0db1b0e 100644 --- a/usr/src/pkg/manifests/SUNWzoneint.mf +++ b/usr/src/pkg/manifests/SUNWzoneint.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWzoneint@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/zones/internal@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/SUNWzyd.mf b/usr/src/pkg/manifests/SUNWzyd.mf index a5d0f032fd..58890f77fa 100644 --- a/usr/src/pkg/manifests/SUNWzyd.mf +++ b/usr/src/pkg/manifests/SUNWzyd.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/SUNWzyd@0.5.11,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/zyd@0.5.11,5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/audio-audio-utilities.mf b/usr/src/pkg/manifests/audio-audio-utilities.mf index 632435ce1b..77e863a13d 100644 --- a/usr/src/pkg/manifests/audio-audio-utilities.mf +++ b/usr/src/pkg/manifests/audio-audio-utilities.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/audio/audio-utilities@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="SunOS audio applications" set name=pkg.summary value="Audio Applications" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin file path=usr/bin/audioconvert mode=0555 @@ -37,7 +35,8 @@ file path=usr/bin/audioctl mode=0555 file path=usr/bin/audioplay mode=0555 file path=usr/bin/audiorecord mode=0555 file path=usr/bin/audiotest mode=0555 -legacy pkg=SUNWauda arch=$(ARCH) category=system desc="SunOS audio applications" \ +legacy pkg=SUNWauda arch=$(ARCH) category=system \ + desc="SunOS audio applications" \ hotline="Please contact your local service provider" \ name="Audio Applications" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/avs.mf b/usr/src/pkg/manifests/avs.mf index 76b00bdfb1..29afa7db69 100644 --- a/usr/src/pkg/manifests/avs.mf +++ b/usr/src/pkg/manifests/avs.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/avs@0.1,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=storage/avs type=require diff --git a/usr/src/pkg/manifests/benchmark-filebench.mf b/usr/src/pkg/manifests/benchmark-filebench.mf index da71dcde1c..a44e914b19 100644 --- a/usr/src/pkg/manifests/benchmark-filebench.mf +++ b/usr/src/pkg/manifests/benchmark-filebench.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/benchmark/filebench@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value=FileBench set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/benchmarks dir path=usr/benchmarks/filebench @@ -71,7 +69,8 @@ file path=usr/benchmarks/filebench/workloads/filemicro_rwritedsync.f mode=0444 file path=usr/benchmarks/filebench/workloads/filemicro_rwritefsync.f mode=0444 file path=usr/benchmarks/filebench/workloads/filemicro_seqread.f mode=0444 file path=usr/benchmarks/filebench/workloads/filemicro_seqwrite.f mode=0444 -file path=usr/benchmarks/filebench/workloads/filemicro_seqwriterand.f mode=0444 +file path=usr/benchmarks/filebench/workloads/filemicro_seqwriterand.f \ + mode=0444 file path=usr/benchmarks/filebench/workloads/filemicro_seqwriterandvargam.f \ mode=0444 file path=usr/benchmarks/filebench/workloads/filemicro_seqwriterandvartab.f \ @@ -85,7 +84,8 @@ file path=usr/benchmarks/filebench/workloads/mongo.f mode=0444 file path=usr/benchmarks/filebench/workloads/multistreamread.f mode=0444 file path=usr/benchmarks/filebench/workloads/multistreamreaddirect.f mode=0444 file path=usr/benchmarks/filebench/workloads/multistreamwrite.f mode=0444 -file path=usr/benchmarks/filebench/workloads/multistreamwritedirect.f mode=0444 +file path=usr/benchmarks/filebench/workloads/multistreamwritedirect.f \ + mode=0444 file path=usr/benchmarks/filebench/workloads/networkfs.f mode=0444 file path=usr/benchmarks/filebench/workloads/oltp.f mode=0444 file path=usr/benchmarks/filebench/workloads/openfiles.f mode=0444 @@ -96,9 +96,11 @@ file path=usr/benchmarks/filebench/workloads/randomwrite.f mode=0444 file path=usr/benchmarks/filebench/workloads/ratelimcopyfiles.f mode=0444 file path=usr/benchmarks/filebench/workloads/removedirs.f mode=0444 file path=usr/benchmarks/filebench/workloads/singlestreamread.f mode=0444 -file path=usr/benchmarks/filebench/workloads/singlestreamreaddirect.f mode=0444 +file path=usr/benchmarks/filebench/workloads/singlestreamreaddirect.f \ + mode=0444 file path=usr/benchmarks/filebench/workloads/singlestreamwrite.f mode=0444 -file path=usr/benchmarks/filebench/workloads/singlestreamwritedirect.f mode=0444 +file path=usr/benchmarks/filebench/workloads/singlestreamwritedirect.f \ + mode=0444 file path=usr/benchmarks/filebench/workloads/tpcso.f mode=0444 file path=usr/benchmarks/filebench/workloads/varmail.f mode=0444 file path=usr/benchmarks/filebench/workloads/videoserver.f mode=0444 diff --git a/usr/src/pkg/manifests/compatibility-ucb.mf b/usr/src/pkg/manifests/compatibility-ucb.mf index 136c4a57d9..cc937abf1d 100644 --- a/usr/src/pkg/manifests/compatibility-ucb.mf +++ b/usr/src/pkg/manifests/compatibility-ucb.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/compatibility/ucb@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Source Compatibility" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/mail group=mail dir path=export group=sys @@ -44,7 +42,8 @@ $(i386_ONLY)dir path=usr/ucb/$(ARCH32) dir path=usr/ucb/$(ARCH64) dir path=usr/ucblib dir path=usr/ucblib/$(ARCH64) -file path=etc/mail/Mail.rc original_name=SUNWscp:etc/mail/Mail.rc preserve=true +file path=etc/mail/Mail.rc original_name=SUNWscp:etc/mail/Mail.rc \ + preserve=true file path=usr/ucb/basename mode=0755 file path=usr/ucb/biff mode=0755 file path=usr/ucb/chown mode=0755 @@ -104,7 +103,8 @@ license ucbcmd/basename/THIRDPARTYLICENSE \ license=ucbcmd/basename/THIRDPARTYLICENSE license ucbcmd/echo/THIRDPARTYLICENSE license=ucbcmd/echo/THIRDPARTYLICENSE license ucbcmd/from/THIRDPARTYLICENSE license=ucbcmd/from/THIRDPARTYLICENSE -license ucbcmd/groups/THIRDPARTYLICENSE license=ucbcmd/groups/THIRDPARTYLICENSE +license ucbcmd/groups/THIRDPARTYLICENSE \ + license=ucbcmd/groups/THIRDPARTYLICENSE license ucbcmd/ln/THIRDPARTYLICENSE license=ucbcmd/ln/THIRDPARTYLICENSE license ucbcmd/ls/THIRDPARTYLICENSE license=ucbcmd/ls/THIRDPARTYLICENSE license ucbcmd/sum/THIRDPARTYLICENSE license=ucbcmd/sum/THIRDPARTYLICENSE @@ -113,12 +113,14 @@ license ucbcmd/tset/THIRDPARTYLICENSE license=ucbcmd/tset/THIRDPARTYLICENSE license ucbcmd/users/THIRDPARTYLICENSE license=ucbcmd/users/THIRDPARTYLICENSE license ucbcmd/whereis/THIRDPARTYLICENSE \ license=ucbcmd/whereis/THIRDPARTYLICENSE -license ucbcmd/whoami/THIRDPARTYLICENSE license=ucbcmd/whoami/THIRDPARTYLICENSE +license ucbcmd/whoami/THIRDPARTYLICENSE \ + license=ucbcmd/whoami/THIRDPARTYLICENSE license ucblib/libcurses/THIRDPARTYLICENSE \ license=ucblib/libcurses/THIRDPARTYLICENSE license ucblib/libtermcap/THIRDPARTYLICENSE \ license=ucblib/libtermcap/THIRDPARTYLICENSE -license ucblib/libucb/THIRDPARTYLICENSE license=ucblib/libucb/THIRDPARTYLICENSE +license ucblib/libucb/THIRDPARTYLICENSE \ + license=ucblib/libucb/THIRDPARTYLICENSE link path=etc/chroot target=../usr/sbin/chroot link path=etc/fuser target=../usr/sbin/fuser link path=etc/link target=../usr/sbin/link diff --git a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf index c57e543adf..00ed5e34c0 100644 --- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf +++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf @@ -21,7 +21,8 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -set name=pkg.fmri value=pkg:/consolidation/osnet/osnet-message-files@$(PKGVERS) +set name=pkg.fmri \ + value=pkg:/consolidation/osnet/osnet-message-files@$(PKGVERS) set name=pkg.description \ value="localizable message files for the OS-Networking consolidation" set name=pkg.summary value="Localizable ON message files" @@ -34,7 +35,6 @@ set name=info.classification \ # set name=org.opensolaris.nodepend value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/help @@ -332,8 +332,10 @@ file path=usr/lib/locale/C/LC_TIME/SUNW_OST_OSCMD.po group=sys file path=usr/lib/locale/C/LC_TIME/SUNW_OST_OSLIB.po group=sys file path=usr/share/lib/locale/com/sun/admin/pm/client/pmHelpResources.java \ group=lp -file path=usr/share/lib/locale/com/sun/admin/pm/client/pmResources.java group=lp -file path=usr/share/lib/locale/com/sun/dhcpmgr/bridge/ResourceBundle.properties +file path=usr/share/lib/locale/com/sun/admin/pm/client/pmResources.java \ + group=lp +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/bridge/ResourceBundle.properties file \ path=usr/share/lib/locale/com/sun/dhcpmgr/cli/common/ResourceBundle.properties file \ @@ -346,7 +348,8 @@ file \ path=usr/share/lib/locale/com/sun/dhcpmgr/cli/pntadm/ResourceBundle.properties file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/OptionDescriptions.properties -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/ResourceBundle.properties +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/ResourceBundle.properties file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/SUNWbinfiles/ResourceBundle.properties file \ @@ -358,20 +361,26 @@ file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/art/folder.gif file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/art/macro2.gif file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/art/macroflow.gif file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/art/tip2.gif -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_create.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_create.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_del.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_dup.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_how.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_mod.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_multi.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_multi.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_ref.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_rel.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_view.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_addr_wiz.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_config_wiz.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_convert_wiz.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_export_wiz.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_import_wiz.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_config_wiz.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_convert_wiz.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_export_wiz.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_import_wiz.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_create.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_del.html @@ -379,26 +388,35 @@ file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_dup.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_how.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_mod.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_ref.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_view.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macro_view.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_macros_about.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_main_hlp.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_main_how.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_main_idx.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_main_menus.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_main_menus.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_main_top.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_net_del.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_net_ref.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_net_wiz.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_create.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_del.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_dup.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_how.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_mod.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_ref.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_tags.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_view.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_del.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_dup.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_how.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_mod.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_ref.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_tags.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_option_view.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_choose.html file \ @@ -408,17 +426,21 @@ file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_enable.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_how.html file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_ref.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_serv.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_serv.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_relay_unconfig.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_server_serv.html +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_server_serv.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_server_unconfig.html file \ path=usr/share/lib/locale/com/sun/dhcpmgr/client/help/dhcp_solaris_about.html -file path=usr/share/lib/locale/com/sun/dhcpmgr/common/ResourceBundle.properties +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/common/ResourceBundle.properties file path=usr/share/lib/locale/com/sun/dhcpmgr/data/ResourceBundle.properties -file path=usr/share/lib/locale/com/sun/dhcpmgr/server/ResourceBundle.properties +file \ + path=usr/share/lib/locale/com/sun/dhcpmgr/server/ResourceBundle.properties file path=usr/share/lib/locale/com/sun/dhcpmgr/ui/ResourceBundle.properties file path=usr/share/lib/locale/com/sun/slp/ClientLib_en.properties group=sys file path=usr/share/lib/locale/com/sun/slp/Server_en.properties group=sys diff --git a/usr/src/pkg/manifests/developer-appcert.mf b/usr/src/pkg/manifests/developer-appcert.mf index 6cb6b73e03..498773816d 100644 --- a/usr/src/pkg/manifests/developer-appcert.mf +++ b/usr/src/pkg/manifests/developer-appcert.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/appcert@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="ABI Application Certification Tools" set name=info.classification \ value="org.opensolaris.category.2008:System/Software Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -51,8 +49,8 @@ file path=usr/lib/abi/appcert/symreport mode=0555 legacy pkg=SUNWapct arch=$(ARCH) category=system \ desc="Appcert utility for application ABI stability checking" \ hotline="Please contact your local service provider" \ - name="ABI Application Certification Tools" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="ABI Application Certification Tools" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL depend fmri=runtime/perl-584 type=require diff --git a/usr/src/pkg/manifests/developer-apptrace-platform.mf b/usr/src/pkg/manifests/developer-apptrace-platform.mf index 362514d38f..265eb03df9 100644 --- a/usr/src/pkg/manifests/developer-apptrace-platform.mf +++ b/usr/src/pkg/manifests/developer-apptrace-platform.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/apptrace/platform@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Platform specific apptrace support" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/platform group=sys dir path=usr/platform/SUNW,A70 group=sys diff --git a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf b/usr/src/pkg/manifests/developer-apptrace-ucblib.mf index f6ce89e05a..ec31b1e2e2 100644 --- a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf +++ b/usr/src/pkg/manifests/developer-apptrace-ucblib.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/apptrace/ucblib@$(PKGVERS) @@ -31,12 +30,11 @@ set name=pkg.summary value="Apptrace support objects for ucblib" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/ucblib legacy pkg=SUNWucbt arch=$(ARCH) category=system \ desc="Apptrace shared objects for UCB compatibility libraries" \ hotline="Please contact your local service provider" \ - name="Apptrace support objects for ucblib" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Apptrace support objects for ucblib" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/developer-apptrace.mf b/usr/src/pkg/manifests/developer-apptrace.mf index 0a032d9c85..4e68da5684 100644 --- a/usr/src/pkg/manifests/developer-apptrace.mf +++ b/usr/src/pkg/manifests/developer-apptrace.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/apptrace@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Apptrace Utility" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/developer-astdev.mf b/usr/src/pkg/manifests/developer-astdev.mf index 7f0c035595..d51e8709e5 100644 --- a/usr/src/pkg/manifests/developer-astdev.mf +++ b/usr/src/pkg/manifests/developer-astdev.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/astdev@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="AT&T AST development utilities" set name=info.classification \ value="org.opensolaris.category.2008:System/Software Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/ast group=sys dir path=usr/ast/bin diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 3c820fca9f..9eb3b9477d 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -35,7 +35,6 @@ set name=info.classification \ # set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=opt group=sys dir path=opt/onbld dir path=opt/onbld/bin diff --git a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf index 9613bbf0d0..4b2d0bc72c 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/developer/debug/mdb/module/module-fibre-channel@$(PKGVERS) set name=pkg.description value="Fibre Channel adb macros and mdb modules" set name=pkg.summary value="Fibre Channel adb macros and mdb modules" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/mdb group=sys diff --git a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf index 0bd7275bef..3cd04a1858 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/debug/mdb/module/module-qlc@$(PKGVERS) set name=pkg.description \ value="Utilties associated with the Qlogic Fibre Channel Adapter" set name=pkg.summary value="Qlogic Fibre Channel Adapter Utilities" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/mdb group=sys diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf index e03a1bf80a..957d1ca292 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/debug/mdb@$(PKGVERS) @@ -30,47 +29,30 @@ set name=pkg.summary value="Modular Debugger" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ +dir path=kernel group=sys +dir path=kernel/kmdb group=sys +dir path=kernel/kmdb/$(ARCH64) group=sys +dir path=platform group=sys variant.opensolaris.zone=global +$(i386_ONLY)dir path=platform/i86pc group=sys variant.opensolaris.zone=global +$(i386_ONLY)dir path=platform/i86pc/kernel group=sys \ variant.opensolaris.zone=global -dir path=kernel/kmdb group=sys opensolaris.zone=global \ +$(i386_ONLY)dir path=platform/i86pc/kernel/kmdb group=sys +$(i386_ONLY)dir path=platform/i86pc/kernel/kmdb/$(ARCH64) group=sys +$(i386_ONLY)dir path=platform/i86xpv group=sys variant.opensolaris.zone=global +$(i386_ONLY)dir path=platform/i86xpv/kernel group=sys \ variant.opensolaris.zone=global -dir path=kernel/kmdb/$(ARCH64) group=sys opensolaris.zone=global \ +$(i386_ONLY)dir path=platform/i86xpv/kernel/kmdb group=sys +$(i386_ONLY)dir path=platform/i86xpv/kernel/kmdb/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/sun4u group=sys variant.opensolaris.zone=global +$(sparc_ONLY)dir path=platform/sun4u/kernel group=sys \ variant.opensolaris.zone=global -dir path=platform group=sys opensolaris.zone=global \ +$(sparc_ONLY)dir path=platform/sun4u/kernel/kmdb group=sys +$(sparc_ONLY)dir path=platform/sun4u/kernel/kmdb/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/sun4v group=sys variant.opensolaris.zone=global +$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys \ variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86pc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86pc/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86pc/kernel/kmdb group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86pc/kernel/kmdb/$(ARCH64) group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86xpv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86xpv/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86xpv/kernel/kmdb group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)dir path=platform/i86xpv/kernel/kmdb/$(ARCH64) group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4u/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4u/kernel/kmdb group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4u/kernel/kmdb/$(ARCH64) group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4v group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4v/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4v/kernel/kmdb group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(sparc_ONLY)dir path=platform/sun4v/kernel/kmdb/$(ARCH64) group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global +$(sparc_ONLY)dir path=platform/sun4v/kernel/kmdb group=sys +$(sparc_ONLY)dir path=platform/sun4v/kernel/kmdb/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/bin/$(ARCH32) @@ -106,208 +88,115 @@ $(sparc_ONLY)dir path=usr/platform/sun4v/lib $(sparc_ONLY)dir path=usr/platform/sun4v/lib/mdb group=sys $(sparc_ONLY)dir path=usr/platform/sun4v/lib/mdb/kvm group=sys $(sparc_ONLY)dir path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64) group=sys -file path=kernel/kmdb/$(ARCH64)/arp group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/cpc group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/cpu.generic group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global +file path=kernel/kmdb/$(ARCH64)/arp group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/cpc group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/cpu.generic group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/cpu_ms.AuthenticAMD.15 group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/crypto group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/genunix group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/hook group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/intr group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/ip group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/ipc group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/ipp group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/krtld group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/lofs group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/logindmux group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/mac group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/md group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/mdb_ds group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/mpt group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/mpt_sas group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/mr_sas group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/nca group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/neti group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/nfs group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/ptm group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/random group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/s1394 group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/sata group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/scsi_vhci group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/sctp group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/sd group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/sockfs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/specfs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/sppp group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/ssd group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/ufs group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/uhci group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/usba group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/arp group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/cpc group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/cpu.generic group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/cpu_ms.AuthenticAMD.15 group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/crypto group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/genunix group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/hook group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/ip group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/ipc group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/ipp group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/krtld group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/lofs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/logindmux group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/mac group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/md group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/mdb_ds group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/mpt group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/mpt_sas group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/mr_sas group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/nca group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/neti group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/nfs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/ptm group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/random group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/s1394 group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/sata group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/scsi_vhci group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/sctp group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/sd group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/sockfs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/specfs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/sppp group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/ufs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/uhci group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/usba group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global + mode=0555 +file path=kernel/kmdb/$(ARCH64)/crypto group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/genunix group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/hook group=sys mode=0555 +$(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/intr group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/ip group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/ipc group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/ipp group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/krtld group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/lofs group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/logindmux group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/mac group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/md group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/mdb_ds group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/mpt group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/mpt_sas group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/mr_sas group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/nca group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/neti group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/nfs group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/ptm group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/random group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/s1394 group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/sata group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/scsi_vhci group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/sctp group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/sd group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/sockfs group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/specfs group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/sppp group=sys mode=0555 +$(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/ssd group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/ufs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/uhci group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/usba group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/arp group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/cpc group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/cpu.generic group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/cpu_ms.AuthenticAMD.15 group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/crypto group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/genunix group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/hook group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/ip group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/ipc group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/ipp group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/krtld group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/lofs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/logindmux group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/mac group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/md group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/mdb_ds group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/mpt group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/mpt_sas group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/mr_sas group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/nca group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/neti group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/nfs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/ptm group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/random group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/s1394 group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sata group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/scsi_vhci group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sctp group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sd group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sockfs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/specfs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sppp group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/ufs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/uhci group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/usba group=sys mode=0555 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/pcplusmp group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/unix group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/uppc group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/pcplusmp group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/unix group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/uppc group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global + mode=0555 +$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/pcplusmp group=sys mode=0555 +$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/unix group=sys mode=0555 +$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/uppc group=sys mode=0555 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/unix group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_psm group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_uppc group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/unix group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/xpv_psm group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/xpv_uppc group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global + mode=0555 +$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/unix group=sys mode=0555 +$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/xpv_psm group=sys mode=0555 +$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/xpv_uppc group=sys mode=0555 $(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/oplhwd group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/sgenv group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/sgsbbc group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/unix group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/errh group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/ldc group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/mdesc group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/unix group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 $(sparc_ONLY)file path=platform/sun4v/kernel/kmdb/$(ARCH64)/vdsk group=sys \ - mode=0555 opensolaris.zone=global reboot-needed=true \ - variant.opensolaris.zone=global + mode=0555 file path=usr/bin/$(ARCH32)/mdb mode=0555 file path=usr/bin/$(ARCH64)/mdb mode=0555 file path=usr/include/sys/mdb_modapi.h @@ -399,7 +288,8 @@ file path=usr/lib/mdb/proc/$(ARCH64)/libtopo.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libumem.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libuutil.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/mdb_ds.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/proc/$(ARCH64)/mdb_test.so group=sys mode=0555 +$(i386_ONLY)file path=usr/lib/mdb/proc/$(ARCH64)/mdb_test.so group=sys \ + mode=0555 file path=usr/lib/mdb/proc/ld.so group=sys mode=0555 file path=usr/lib/mdb/proc/libavl.so group=sys mode=0555 file path=usr/lib/mdb/proc/libc.so group=sys mode=0555 @@ -415,25 +305,28 @@ file path=usr/lib/mdb/proc/svc.configd.so group=sys mode=0555 file path=usr/lib/mdb/proc/svc.startd.so group=sys mode=0555 $(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/pcplusmp.so \ group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/unix.so group=sys \ +$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/unix.so \ + group=sys mode=0555 +$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/uppc.so \ + group=sys mode=0555 +$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/pcplusmp.so group=sys \ mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/uppc.so group=sys \ +$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/unix.so group=sys \ mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/pcplusmp.so group=sys \ +$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/uppc.so group=sys \ mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/unix.so group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/uppc.so group=sys mode=0555 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/unix.so \ group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv.so group=sys \ - mode=0555 +$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv.so \ + group=sys mode=0555 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv_psm.so \ group=sys mode=0555 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv_uppc.so \ group=sys mode=0555 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/unix.so group=sys \ mode=0555 -$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv.so group=sys mode=0555 +$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv.so group=sys \ + mode=0555 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv_psm.so group=sys \ mode=0555 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv_uppc.so group=sys \ @@ -448,8 +341,8 @@ $(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/unix.so \ group=sys mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/errh.so \ group=sys mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/ldc.so group=sys \ - mode=0555 +$(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/ldc.so \ + group=sys mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/mdesc.so \ group=sys mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/mdb/kvm/$(ARCH64)/unix.so \ @@ -471,14 +364,10 @@ legacy pkg=SUNWmdbr arch=$(ARCH) category=system \ version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/niumx opensolaris.zone=global \ - target=intr variant.opensolaris.zone=global -$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcipsy opensolaris.zone=global \ - target=intr variant.opensolaris.zone=global -$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcisch opensolaris.zone=global \ - target=intr variant.opensolaris.zone=global -$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/px opensolaris.zone=global \ - target=intr variant.opensolaris.zone=global +$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/niumx target=intr +$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcipsy target=intr +$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/pcisch target=intr +$(sparc_ONLY)link path=kernel/kmdb/$(ARCH64)/px target=intr $(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/niumx.so target=intr.so $(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/pcipsy.so target=intr.so $(sparc_ONLY)link path=usr/lib/mdb/kvm/$(ARCH64)/pcisch.so target=intr.so diff --git a/usr/src/pkg/manifests/developer-driver-ftsafe.mf b/usr/src/pkg/manifests/developer-driver-ftsafe.mf index 8f5fe9bbc8..65e56f9ee4 100644 --- a/usr/src/pkg/manifests/developer-driver-ftsafe.mf +++ b/usr/src/pkg/manifests/developer-driver-ftsafe.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/driver/ftsafe@$(PKGVERS) @@ -30,23 +29,16 @@ set name=pkg.summary value="ftSafe developer utilities package" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/sbin driver name=bofi perms="* 0600 bin bin" -file path=kernel/drv/$(ARCH64)/bofi group=sys mode=0644 opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/bofi group=sys mode=0644 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=kernel/drv/bofi.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/bofi group=sys mode=0644 +$(i386_ONLY)file path=kernel/drv/bofi group=sys mode=0644 +file path=kernel/drv/bofi.conf group=sys file path=usr/lib/th_script mode=0555 file path=usr/sbin/th_define mode=0555 file path=usr/sbin/th_manage mode=0555 diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf index ac7ed967b8..ae0e693c36 100644 --- a/usr/src/pkg/manifests/developer-dtrace.mf +++ b/usr/src/pkg/manifests/developer-dtrace.mf @@ -29,7 +29,6 @@ set name=pkg.summary value="DTrace Clients" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/demo dir path=usr/demo/dtrace @@ -217,8 +216,10 @@ file path=usr/share/lib/java/javadoc/dtrace/api/allclasses-frame.html \ group=other file path=usr/share/lib/java/javadoc/dtrace/api/allclasses-noframe.html \ group=other -file path=usr/share/lib/java/javadoc/dtrace/api/constant-values.html group=other -file path=usr/share/lib/java/javadoc/dtrace/api/deprecated-list.html group=other +file path=usr/share/lib/java/javadoc/dtrace/api/constant-values.html \ + group=other +file path=usr/share/lib/java/javadoc/dtrace/api/deprecated-list.html \ + group=other file path=usr/share/lib/java/javadoc/dtrace/api/help-doc.html group=other file path=usr/share/lib/java/javadoc/dtrace/api/index-all.html group=other file path=usr/share/lib/java/javadoc/dtrace/api/index.html group=other @@ -610,26 +611,31 @@ file path=usr/share/lib/java/javadoc/dtrace/api/overview-tree.html group=other file path=usr/share/lib/java/javadoc/dtrace/api/package-list group=other file path=usr/share/lib/java/javadoc/dtrace/api/resources/inherit.gif \ group=other -file path=usr/share/lib/java/javadoc/dtrace/api/serialized-form.html group=other +file path=usr/share/lib/java/javadoc/dtrace/api/serialized-form.html \ + group=other file path=usr/share/lib/java/javadoc/dtrace/api/stylesheet.css group=other file path=usr/share/lib/java/javadoc/dtrace/examples/TestAPI.java group=other file path=usr/share/lib/java/javadoc/dtrace/examples/TestAPI2.java group=other -file path=usr/share/lib/java/javadoc/dtrace/examples/TestTarget.java group=other +file path=usr/share/lib/java/javadoc/dtrace/examples/TestTarget.java \ + group=other file path=usr/share/lib/java/javadoc/dtrace/examples/hello.d group=other file path=usr/share/lib/java/javadoc/dtrace/examples/intrstat.d group=other file path=usr/share/lib/java/javadoc/dtrace/examples/syscall.d group=other file path=usr/share/lib/java/javadoc/dtrace/examples/target.d group=other -file path=usr/share/lib/java/javadoc/dtrace/html/JavaDTraceAPI.html group=other +file path=usr/share/lib/java/javadoc/dtrace/html/JavaDTraceAPI.html \ + group=other file path=usr/share/lib/java/javadoc/dtrace/html/fast.html group=other -file path=usr/share/lib/java/javadoc/dtrace/images/JavaDTraceAPI.gif group=other +file path=usr/share/lib/java/javadoc/dtrace/images/JavaDTraceAPI.gif \ + group=other hardlink path=usr/sbin/dtrace target=../../usr/lib/isaexec hardlink path=usr/sbin/intrstat target=../../usr/lib/isaexec hardlink path=usr/sbin/lockstat target=../../usr/lib/isaexec hardlink path=usr/sbin/plockstat target=../../usr/lib/isaexec legacy pkg=SUNWdtrc arch=$(ARCH) category=system \ desc="Dynamic Tracing (DTrace) Clients" \ - hotline="Please contact your local service provider" name="DTrace Clients" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="DTrace Clients" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_iprb license=lic_iprb diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.mf index 765e07462d..a2352818a6 100644 --- a/usr/src/pkg/manifests/developer-library-lint.mf +++ b/usr/src/pkg/manifests/developer-library-lint.mf @@ -29,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Lint Libraries" set name=info.classification value=org.opensolaris.category.2008:Development/C set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/$(ARCH64) dir path=usr group=sys @@ -49,10 +48,10 @@ file path=lib/$(ARCH64)/llib-lbsm.ln file path=lib/$(ARCH64)/llib-lc.ln file path=lib/$(ARCH64)/llib-lc_db.ln file path=lib/$(ARCH64)/llib-lcontract.ln +file path=lib/$(ARCH64)/llib-lcryptoutil.ln file path=lib/$(ARCH64)/llib-lctf.ln file path=lib/$(ARCH64)/llib-lcurses file path=lib/$(ARCH64)/llib-lcurses.ln -file path=lib/$(ARCH64)/llib-lcryptoutil.ln file path=lib/$(ARCH64)/llib-ldevice.ln file path=lib/$(ARCH64)/llib-ldevid.ln file path=lib/$(ARCH64)/llib-ldevinfo.ln @@ -104,12 +103,12 @@ file path=lib/llib-lc_db file path=lib/llib-lc_db.ln file path=lib/llib-lcontract file path=lib/llib-lcontract.ln +file path=lib/llib-lcryptoutil +file path=lib/llib-lcryptoutil.ln file path=lib/llib-lctf file path=lib/llib-lctf.ln file path=lib/llib-lcurses file path=lib/llib-lcurses.ln -file path=lib/llib-lcryptoutil -file path=lib/llib-lcryptoutil.ln file path=lib/llib-ldevice file path=lib/llib-ldevice.ln file path=lib/llib-ldevid @@ -232,6 +231,7 @@ file path=usr/lib/$(ARCH64)/llib-lsldap.ln file path=usr/lib/$(ARCH64)/llib-lsmbios.ln file path=usr/lib/$(ARCH64)/llib-lssagent.ln file path=usr/lib/$(ARCH64)/llib-lssasnmp.ln +$(sparc_ONLY)file path=usr/lib/$(ARCH64)/llib-lv12n.ln file path=usr/lib/$(ARCH64)/llib-lvolmgt.ln file path=usr/lib/$(ARCH64)/llib-lvt0.ln file path=usr/lib/$(ARCH64)/values-Xa.o @@ -327,7 +327,6 @@ file path=usr/lib/llib-lssasnmp file path=usr/lib/llib-lssasnmp.ln $(sparc_ONLY)file path=usr/lib/llib-lv12n $(sparc_ONLY)file path=usr/lib/llib-lv12n.ln -$(sparc_ONLY)file path=usr/lib/$(ARCH64)/llib-lv12n.ln file path=usr/lib/llib-lvolmgt file path=usr/lib/llib-lvolmgt.ln file path=usr/lib/llib-lvt0 @@ -433,7 +432,8 @@ link path=usr/lib/$(ARCH64)/llib-laio.ln \ target=../../../lib/$(ARCH64)/llib-laio.ln link path=usr/lib/$(ARCH64)/llib-lbsm.ln \ target=../../../lib/$(ARCH64)/llib-lbsm.ln -link path=usr/lib/$(ARCH64)/llib-lc.ln target=../../../lib/$(ARCH64)/llib-lc.ln +link path=usr/lib/$(ARCH64)/llib-lc.ln \ + target=../../../lib/$(ARCH64)/llib-lc.ln link path=usr/lib/$(ARCH64)/llib-lcontract.ln \ target=../../../lib/$(ARCH64)/llib-lcontract.ln link path=usr/lib/$(ARCH64)/llib-lctf.ln \ diff --git a/usr/src/pkg/manifests/developer-library-profiled-libc.mf b/usr/src/pkg/manifests/developer-library-profiled-libc.mf index 773abc54e5..c545f4bb8c 100644 --- a/usr/src/pkg/manifests/developer-library-profiled-libc.mf +++ b/usr/src/pkg/manifests/developer-library-profiled-libc.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/library/profiled-libc@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Developer Profiled Libraries" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/libp diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.mf index 1ed6485237..f60874e7da 100644 --- a/usr/src/pkg/manifests/developer-linker.mf +++ b/usr/src/pkg/manifests/developer-linker.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/linker@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Programming Tools" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/bin/$(ARCH32) diff --git a/usr/src/pkg/manifests/developer-object-file.mf b/usr/src/pkg/manifests/developer-object-file.mf index 3887a865a4..4b662ee421 100644 --- a/usr/src/pkg/manifests/developer-object-file.mf +++ b/usr/src/pkg/manifests/developer-object-file.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/object-file@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="CCS tools bundled with SunOS" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/bin/$(ARCH64) diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf index d23d561c7b..0af5ee2d4d 100644 --- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf +++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf @@ -30,7 +30,6 @@ set name=info.classification \ value="org.opensolaris.category.2008:Development/Distribution Tools" set name=org.opensolaris.noincorp value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=SUNWadmj type=require depend fmri=SUNWjsnmp type=require depend fmri=SUNWwbapi type=require diff --git a/usr/src/pkg/manifests/developer-tnf.mf b/usr/src/pkg/manifests/developer-tnf.mf index b29527cb1a..6aff91bbc3 100644 --- a/usr/src/pkg/manifests/developer-tnf.mf +++ b/usr/src/pkg/manifests/developer-tnf.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/developer/tnf@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="TNF Developer Components" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/include diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf index 78b5e48cd7..1ac7fea3dd 100644 --- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf +++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/diagnostic/cpu-counters@$(PKGVERS) -set name=pkg.description value="CPU Performance Counter libraries and utilities" +set name=pkg.description \ + value="CPU Performance Counter libraries and utilities" set name=pkg.summary value="CPU Performance Counter libraries and utilities" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin $(i386_ONLY)dir path=usr/bin/$(ARCH32) @@ -54,12 +53,13 @@ $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.15 group=sys \ mode=0755 $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6 group=sys \ mode=0755 -$(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.15 group=sys \ - mode=0755 +$(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.15 \ + group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.AuthenticAMD group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.15 group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.6 group=sys mode=0755 -$(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.6.15 group=sys mode=0755 +$(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.6.15 group=sys \ + mode=0755 file path=usr/lib/$(ARCH64)/libcpc.so.1 file path=usr/lib/$(ARCH64)/libpctx.so.1 file path=usr/lib/$(ARCH64)/llib-lcpc.ln diff --git a/usr/src/pkg/manifests/diagnostic-latencytop.mf b/usr/src/pkg/manifests/diagnostic-latencytop.mf index 76edde1707..53389c582a 100644 --- a/usr/src/pkg/manifests/diagnostic-latencytop.mf +++ b/usr/src/pkg/manifests/diagnostic-latencytop.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/diagnostic/latencytop@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="LatencyTOP tool" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin $(i386_ONLY)dir path=usr/bin/$(ARCH32) @@ -39,7 +37,8 @@ $(i386_ONLY)file path=usr/bin/$(ARCH32)/latencytop mode=0555 file path=usr/bin/$(ARCH64)/latencytop mode=0555 hardlink path=usr/bin/latencytop target=../../usr/lib/isaexec legacy pkg=SUNWlatencytop arch=$(ARCH) category=system desc="LatencyTOP tool" \ - hotline="Please contact your local service provider" name="LatencyTOP tool" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="LatencyTOP tool" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/diagnostic-powertop.mf b/usr/src/pkg/manifests/diagnostic-powertop.mf index d376e106e0..7aae840610 100644 --- a/usr/src/pkg/manifests/diagnostic-powertop.mf +++ b/usr/src/pkg/manifests/diagnostic-powertop.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/diagnostic/powertop@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="PowerTOP tool" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin $(i386_ONLY)dir path=usr/bin/$(ARCH32) diff --git a/usr/src/pkg/manifests/driver-audio-audio810.mf b/usr/src/pkg/manifests/driver-audio-audio810.mf index fd20e78296..f9d46f7893 100644 --- a/usr/src/pkg/manifests/driver-audio-audio810.mf +++ b/usr/src/pkg/manifests/driver-audio-audio810.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audio810@$(PKGVERS) set name=pkg.description \ value="SunOS audio device driver for W1100z & W2100z workstations" @@ -37,7 +36,6 @@ set name=pkg.summary value="SUNW W1100z & W2100z Audio Drivers" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=info.keyword value=audioi810 set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -67,8 +65,7 @@ driver name=audio810 \ file path=kernel/drv/$(ARCH64)/audio810 group=sys file path=kernel/drv/audio810 group=sys file path=kernel/drv/audio810.conf group=sys \ - original_name=SUNWad810:kernel/drv/audio810.conf preserve=true \ - reboot-needed=false + original_name=SUNWad810:kernel/drv/audio810.conf preserve=true legacy pkg=SUNWad810 arch=$(ARCH) category=system \ desc="SunOS audio device driver for W1100z & W2100z workstations" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-audio-audiocmi.mf b/usr/src/pkg/manifests/driver-audio-audiocmi.mf index 544c86d0b2..f3a0f3ac32 100644 --- a/usr/src/pkg/manifests/driver-audio-audiocmi.mf +++ b/usr/src/pkg/manifests/driver-audio-audiocmi.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiocmi@$(PKGVERS) set name=pkg.description value="SunOS audio device driver for C-Media 8738" set name=pkg.summary value="C-Media 8738 Family Audio Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf index 29e35b9004..3999e5e6d6 100644 --- a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf +++ b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audioemu10k@$(PKGVERS) set name=pkg.description value="SunOS audio device driver for Creative EMU10K" set name=pkg.summary value="Creative EMU10K Audio Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audiohd.mf b/usr/src/pkg/manifests/driver-audio-audiohd.mf index 5eb1b6dc70..e3be186427 100644 --- a/usr/src/pkg/manifests/driver-audio-audiohd.mf +++ b/usr/src/pkg/manifests/driver-audio-audiohd.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiohd@$(PKGVERS) set name=pkg.description \ value="SunOS audio device driver for Munich workstation" set name=pkg.summary value="SUNW High Definition Audio Drivers" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -47,7 +45,7 @@ driver name=audiohd \ alias=pciexclass,0403 file path=kernel/drv/$(ARCH64)/audiohd group=sys file path=kernel/drv/audiohd group=sys -file path=kernel/drv/audiohd.conf group=sys reboot-needed=false +file path=kernel/drv/audiohd.conf group=sys legacy pkg=SUNWaudiohd arch=$(ARCH) category=system \ desc="SunOS audio device driver for Munich workstation" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-audio-audioixp.mf b/usr/src/pkg/manifests/driver-audio-audioixp.mf index 5c13902b5f..7274cd3699 100644 --- a/usr/src/pkg/manifests/driver-audio-audioixp.mf +++ b/usr/src/pkg/manifests/driver-audio-audioixp.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audioixp@$(PKGVERS) set name=pkg.description \ value="SunOS audio device driver for ATI IXP integrated audio hardware" set name=pkg.summary value="SUNW Audio Driver for ATI IXP" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audiols.mf b/usr/src/pkg/manifests/driver-audio-audiols.mf index e4bbb4f689..ae485dc3c9 100644 --- a/usr/src/pkg/manifests/driver-audio-audiols.mf +++ b/usr/src/pkg/manifests/driver-audio-audiols.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiols@$(PKGVERS) set name=pkg.description \ value="SunOS audio device driver for Creative Audigy LS" set name=pkg.summary value="Creative Audigy LS Audio Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audiop16x.mf b/usr/src/pkg/manifests/driver-audio-audiop16x.mf index d6d65041b6..b761774906 100644 --- a/usr/src/pkg/manifests/driver-audio-audiop16x.mf +++ b/usr/src/pkg/manifests/driver-audio-audiop16x.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiop16x@$(PKGVERS) set name=pkg.description \ value="SunOS audio device driver for Creative P16X (EMU10K1X)" set name=pkg.summary value="Creative P16X Audio Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audiosolo.mf b/usr/src/pkg/manifests/driver-audio-audiosolo.mf index b7a5cc1d5d..6e3cd59b39 100644 --- a/usr/src/pkg/manifests/driver-audio-audiosolo.mf +++ b/usr/src/pkg/manifests/driver-audio-audiosolo.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiosolo@$(PKGVERS) set name=pkg.description value="SunOS audio device driver for ESS Solo-1" set name=pkg.summary value="ESS Solo-1 Audio Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf index 2104f05109..b4f9e54134 100644 --- a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf +++ b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiovia823x@$(PKGVERS) set name=pkg.description \ value="SunOS audio device driver for VIA VT823x south bridges" set name=pkg.summary value="SUNW Audio Driver for VIA VT823x" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-audio-audiovia97.mf b/usr/src/pkg/manifests/driver-audio-audiovia97.mf index 04dfe62195..1186d05d17 100644 --- a/usr/src/pkg/manifests/driver-audio-audiovia97.mf +++ b/usr/src/pkg/manifests/driver-audio-audiovia97.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio/audiovia97@$(PKGVERS) set name=pkg.description value="SunOS audio device driver for Via 82C686" set name=pkg.summary value="Via 82C686 Audio Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys driver name=audiovia97 alias=pci1106,3058 diff --git a/usr/src/pkg/manifests/driver-audio.mf b/usr/src/pkg/manifests/driver-audio.mf index e142d4e3e0..fac9abe412 100644 --- a/usr/src/pkg/manifests/driver-audio.mf +++ b/usr/src/pkg/manifests/driver-audio.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/audio@$(PKGVERS) set name=pkg.description value="SunOS audio device drivers" set name=pkg.summary value="Audio Drivers" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -56,13 +54,13 @@ file path=kernel/drv/$(ARCH64)/audioens group=sys file path=kernel/drv/$(ARCH64)/audiopci group=sys file path=kernel/drv/$(ARCH64)/audiots group=sys $(i386_ONLY)file path=kernel/drv/audio group=sys -file path=kernel/drv/audio.conf group=sys reboot-needed=false +file path=kernel/drv/audio.conf group=sys $(i386_ONLY)file path=kernel/drv/audio1575 group=sys $(i386_ONLY)file path=kernel/drv/audioens group=sys $(i386_ONLY)file path=kernel/drv/audiopci group=sys $(i386_ONLY)file path=kernel/drv/audiots group=sys -file path=kernel/misc/$(ARCH64)/ac97 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ac97 group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/ac97 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ac97 group=sys mode=0755 legacy pkg=SUNWaudd arch=$(ARCH) category=system \ desc="SunOS audio device drivers" \ hotline="Please contact your local service provider" name="Audio Drivers" \ diff --git a/usr/src/pkg/manifests/driver-cpu-us.mf b/usr/src/pkg/manifests/driver-cpu-us.mf index 81c4772c1b..101e8cdcc5 100644 --- a/usr/src/pkg/manifests/driver-cpu-us.mf +++ b/usr/src/pkg/manifests/driver-cpu-us.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/cpu/us@$(PKGVERS) set name=pkg.description value="UltraSPARC CPU Device Driver" set name=pkg.summary value="UltraSPARC CPU Device Driver" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/sun4u group=sys dir path=platform/sun4u/kernel group=sys diff --git a/usr/src/pkg/manifests/driver-crypto-dca.mf b/usr/src/pkg/manifests/driver-crypto-dca.mf index 14d2aa58c3..a79840d717 100644 --- a/usr/src/pkg/manifests/driver-crypto-dca.mf +++ b/usr/src/pkg/manifests/driver-crypto-dca.mf @@ -20,22 +20,18 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/crypto/dca@$(PKGVERS) set name=pkg.description value="DCA Crypto Accelerator Supplemental Files" set name=pkg.summary value="DCA Crypto Accelerator" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/fm @@ -53,13 +49,10 @@ driver name=dca \ alias=pci14e4,5821 \ alias=pci14e4,5822 \ alias=pci14e4,5825 -file path=kernel/drv/$(ARCH64)/dca group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/dca group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/dca.conf group=sys opensolaris.zone=global \ - original_name=SUNWdcaf:kernel/drv/dca.conf preserve=true \ - reboot-needed=false variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/dca group=sys +$(i386_ONLY)file path=kernel/drv/dca group=sys +file path=kernel/drv/dca.conf group=sys \ + original_name=SUNWdcaf:kernel/drv/dca.conf preserve=true file path=usr/lib/fm/dict/SCA1000.dict mode=0444 file path=usr/lib/fm/dict/SCA500.dict mode=0444 file path=usr/lib/fm/eft/sca1000.eft mode=0444 diff --git a/usr/src/pkg/manifests/driver-crypto-dprov.mf b/usr/src/pkg/manifests/driver-crypto-dprov.mf index d101ff7150..cf144486dc 100644 --- a/usr/src/pkg/manifests/driver-crypto-dprov.mf +++ b/usr/src/pkg/manifests/driver-crypto-dprov.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/crypto/dprov@$(PKGVERS) @@ -31,7 +30,6 @@ set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=org.opensolaris.redist value=internal set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal # CRYPT DELETE START dir path=etc group=sys dir path=etc/certs group=sys @@ -49,12 +47,12 @@ file path=etc/crypto/certs/SUNWosnet group=sys file path=etc/crypto/certs/SUNWosnetCF group=sys file path=kernel/drv/$(ARCH64)/dprov group=sys $(i386_ONLY)file path=kernel/drv/dprov group=sys -file path=kernel/drv/dprov.conf group=sys reboot-needed=false +file path=kernel/drv/dprov.conf group=sys legacy pkg=SUNWcryptoint arch=$(ARCH) category=system \ desc="Kernel Crypto Framework Test Driver" \ hotline="Please contact your local service provider" \ - name="Kernel Crypto Framework Test Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Kernel Crypto Framework Test Driver" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=kernel/crypto/$(ARCH64)/dprov \ diff --git a/usr/src/pkg/manifests/driver-crypto-n2cp.mf b/usr/src/pkg/manifests/driver-crypto-n2cp.mf index c634f475f6..94c9454f3a 100644 --- a/usr/src/pkg/manifests/driver-crypto-n2cp.mf +++ b/usr/src/pkg/manifests/driver-crypto-n2cp.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/crypto/n2cp@$(PKGVERS) set name=pkg.description value="UltraSPARC-T2 Crypto Provider" set name=pkg.summary value="UltraSPARC-T2 Crypto Provider" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/sun4v group=sys dir path=platform/sun4v/kernel group=sys @@ -46,7 +45,7 @@ driver name=n2cp \ alias=SUNW,n2-cwq \ alias=SUNW,vf-cwq file path=platform/sun4v/kernel/drv/$(ARCH64)/n2cp group=sys -file path=platform/sun4v/kernel/drv/n2cp.conf group=sys reboot-needed=false +file path=platform/sun4v/kernel/drv/n2cp.conf group=sys legacy pkg=SUNWn2cp.v arch=$(ARCH).sun4v category=system \ desc="UltraSPARC-T2 Crypto Provider" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-crypto-tpm.mf b/usr/src/pkg/manifests/driver-crypto-tpm.mf index 2d7030e353..b1af89113e 100644 --- a/usr/src/pkg/manifests/driver-crypto-tpm.mf +++ b/usr/src/pkg/manifests/driver-crypto-tpm.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/crypto/tpm@$(PKGVERS) set name=pkg.description value="Trusted Platform Module driver" set name=pkg.summary value="Trusted Platform Module driver" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(i386_ONLY)dir path=kernel group=sys $(i386_ONLY)dir path=kernel/drv group=sys $(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-firewire.mf b/usr/src/pkg/manifests/driver-firewire.mf index 8c1118431d..ffbe1a2637 100644 --- a/usr/src/pkg/manifests/driver-firewire.mf +++ b/usr/src/pkg/manifests/driver-firewire.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/firewire@$(PKGVERS) set name=pkg.description value="IEEE1394 Framework and OpenHCI Driver" set name=pkg.summary value="Sun IEEE1394 Framework" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,9 +43,9 @@ dir path=kernel/misc/$(ARCH64) group=sys driver name=hci1394 alias=pciclass,0c0010 perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/hci1394 group=sys $(i386_ONLY)file path=kernel/drv/hci1394 group=sys -file path=kernel/drv/hci1394.conf group=sys reboot-needed=false -file path=kernel/misc/$(ARCH64)/s1394 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/s1394 group=sys mode=0755 reboot-needed=true +file path=kernel/drv/hci1394.conf group=sys +file path=kernel/misc/$(ARCH64)/s1394 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/s1394 group=sys mode=0755 legacy pkg=SUNW1394 arch=$(ARCH) category=system \ desc="IEEE1394 Framework and OpenHCI Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-graphics-agpgart.mf b/usr/src/pkg/manifests/driver-graphics-agpgart.mf index a0f4856159..1f3adbba10 100644 --- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf +++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/graphics/agpgart@$(PKGVERS) set name=pkg.description value="AGP GART driver for x86 workstations" set name=pkg.summary value="AGP GART Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Display +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Display set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -80,12 +79,13 @@ file path=kernel/drv/$(ARCH64)/agpgart group=sys file path=kernel/drv/$(ARCH64)/agptarget group=sys file path=kernel/drv/$(ARCH64)_gart group=sys file path=kernel/drv/agpgart group=sys -file path=kernel/drv/agpgart.conf group=sys reboot-needed=false +file path=kernel/drv/agpgart.conf group=sys file path=kernel/drv/agptarget group=sys legacy pkg=SUNWagp arch=$(ARCH) category=system \ desc="AGP GART driver for x86 workstations" \ - hotline="Please contact your local service provider" name="AGP GART Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="AGP GART Driver" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license uts/common/sys/THIRDPARTYLICENSE.agpgart \ diff --git a/usr/src/pkg/manifests/driver-graphics-atiatom.mf b/usr/src/pkg/manifests/driver-graphics-atiatom.mf index 30e904a910..0448e924f4 100644 --- a/usr/src/pkg/manifests/driver-graphics-atiatom.mf +++ b/usr/src/pkg/manifests/driver-graphics-atiatom.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/graphics/atiatom@$(PKGVERS) set name=pkg.description value="Drivers for ATI framebuffer hardware" set name=pkg.summary value="ATI Framebuffer Drivers" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Display +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Display set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-graphics-av1394.mf b/usr/src/pkg/manifests/driver-graphics-av1394.mf index fa9d03cd1c..bbb2ba81bf 100644 --- a/usr/src/pkg/manifests/driver-graphics-av1394.mf +++ b/usr/src/pkg/manifests/driver-graphics-av1394.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/graphics/av1394@$(PKGVERS) set name=pkg.description value="IEEE1394 AV Driver" set name=pkg.summary value="IEEE1394 AV Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf index 73456c8867..3fee2d602d 100644 --- a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf +++ b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/driver/graphics/dcam1394/devfsadm-dcam1394@$(PKGVERS) set name=pkg.description value="Sun IEEE1394 Video Conferencing support" set name=pkg.summary value="Sun IEEE1394 Video Conferencing Support" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf index eb5ac02ee3..a9ac056749 100644 --- a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf +++ b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/graphics/dcam1394@$(PKGVERS) set name=pkg.description value="IEEE1394 Video Conferencing Class Driver" set name=pkg.summary value="IEEE1394 Video Conferencing Class Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-graphics-drm.mf b/usr/src/pkg/manifests/driver-graphics-drm.mf index 48beed5262..374a5923b4 100644 --- a/usr/src/pkg/manifests/driver-graphics-drm.mf +++ b/usr/src/pkg/manifests/driver-graphics-drm.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/graphics/drm@$(PKGVERS) set name=pkg.description \ value="Direct Rendering Manager kernel drivers and modules" set name=pkg.summary value="DRM Kernel Drivers" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Display +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Display set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -71,8 +70,8 @@ file path=kernel/drv/$(ARCH64)/i915 group=sys file path=kernel/drv/$(ARCH64)/radeon group=sys file path=kernel/drv/i915 group=sys file path=kernel/drv/radeon group=sys -file path=kernel/misc/$(ARCH64)/drm group=sys mode=0755 reboot-needed=true -file path=kernel/misc/drm group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/drm group=sys mode=0755 +file path=kernel/misc/drm group=sys mode=0755 legacy pkg=SUNWdrmr arch=$(ARCH) category=system \ desc="Direct Rendering Manager kernel drivers and modules" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-graphics-usbvc.mf b/usr/src/pkg/manifests/driver-graphics-usbvc.mf index 88925e7a27..5eb88c9d92 100644 --- a/usr/src/pkg/manifests/driver-graphics-usbvc.mf +++ b/usr/src/pkg/manifests/driver-graphics-usbvc.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/graphics/usbvc@$(PKGVERS) set name=pkg.description value="usbvc (USB Video Class Driver)" set name=pkg.summary value="USB Video Class Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-i86pc-fipe.mf b/usr/src/pkg/manifests/driver-i86pc-fipe.mf index ebf3c20365..3043619fd7 100644 --- a/usr/src/pkg/manifests/driver-i86pc-fipe.mf +++ b/usr/src/pkg/manifests/driver-i86pc-fipe.mf @@ -20,22 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/i86pc/fipe@$(PKGVERS) -set name=pkg.description value="Intel 5000/7300 memory power management driver" +set name=pkg.description \ + value="Intel 5000/7300 memory power management driver" set name=pkg.summary value="Intel 5000/7300 memory power management driver" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/i86pc group=sys dir path=platform/i86pc/kernel group=sys @@ -46,7 +46,7 @@ driver name=fipe \ alias=pci8086,360c file path=platform/i86pc/kernel/drv/$(ARCH64)/fipe group=sys file path=platform/i86pc/kernel/drv/fipe group=sys -file path=platform/i86pc/kernel/drv/fipe.conf group=sys reboot-needed=false +file path=platform/i86pc/kernel/drv/fipe.conf group=sys legacy pkg=SUNWfipe arch=$(ARCH) category=system \ desc="Intel 5000/7300 memory power management driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-i86pc-ioat.mf b/usr/src/pkg/manifests/driver-i86pc-ioat.mf index 667cb38f8a..5f3911285e 100644 --- a/usr/src/pkg/manifests/driver-i86pc-ioat.mf +++ b/usr/src/pkg/manifests/driver-i86pc-ioat.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/i86pc/ioat@$(PKGVERS) set name=pkg.description value="Sun dcopy DMA drivers" set name=pkg.summary value="Sun dcopy DMA drivers" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys @@ -53,14 +51,14 @@ driver name=ioat \ alias=pciex8086,1a38 \ alias=pciex8086,360b \ alias=pciex8086,402f -file path=kernel/misc/$(ARCH64)/dcopy group=sys mode=0755 reboot-needed=true -file path=kernel/misc/dcopy group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/dcopy group=sys mode=0755 +file path=kernel/misc/dcopy group=sys mode=0755 file path=platform/i86pc/kernel/drv/$(ARCH64)/ioat group=sys file path=platform/i86pc/kernel/drv/ioat group=sys -file path=platform/i86pc/kernel/drv/ioat.conf group=sys reboot-needed=false +file path=platform/i86pc/kernel/drv/ioat.conf group=sys file path=platform/i86xpv/kernel/drv/$(ARCH64)/ioat group=sys file path=platform/i86xpv/kernel/drv/ioat group=sys -file path=platform/i86xpv/kernel/drv/ioat.conf group=sys reboot-needed=false +file path=platform/i86xpv/kernel/drv/ioat.conf group=sys legacy pkg=SUNWdcopy arch=$(ARCH) category=system desc="Sun dcopy DMA drivers" \ hotline="Please contact your local service provider" \ name="Sun dcopy DMA drivers" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/driver-i86pc-platform.mf b/usr/src/pkg/manifests/driver-i86pc-platform.mf index 2872abcc23..96fc5bf0db 100644 --- a/usr/src/pkg/manifests/driver-i86pc-platform.mf +++ b/usr/src/pkg/manifests/driver-i86pc-platform.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/i86pc/platform@$(PKGVERS) set name=pkg.description \ value="Platform Support, Bus-independent Device Drivers" @@ -37,7 +36,6 @@ set name=pkg.summary value="Platform Support, Bus-independent Device Drivers" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -66,35 +64,33 @@ file path=kernel/drv/$(ARCH64)/ecpp group=sys file path=kernel/drv/$(ARCH64)/fd group=sys file path=kernel/drv/$(ARCH64)/fdc group=sys file path=kernel/drv/asy group=sys -file path=kernel/drv/asy.conf group=sys reboot-needed=false +file path=kernel/drv/asy.conf group=sys file path=kernel/drv/cmdk group=sys -file path=kernel/drv/cmdk.conf group=sys reboot-needed=false +file path=kernel/drv/cmdk.conf group=sys file path=kernel/drv/ecpp group=sys -file path=kernel/drv/ecpp.conf group=sys reboot-needed=false +file path=kernel/drv/ecpp.conf group=sys file path=kernel/drv/fd group=sys -file path=kernel/drv/fd.conf group=sys reboot-needed=false +file path=kernel/drv/fd.conf group=sys file path=kernel/drv/fdc group=sys -file path=kernel/drv/fdc.conf group=sys reboot-needed=false +file path=kernel/drv/fdc.conf group=sys file path=kernel/drv/ncrs group=sys -file path=kernel/drv/ncrs.conf group=sys reboot-needed=false -file path=kernel/misc/$(ARCH64)/dadk group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/gda group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/strategy group=sys mode=0755 reboot-needed=true -file path=kernel/misc/dadk group=sys mode=0755 reboot-needed=true -file path=kernel/misc/gda group=sys mode=0755 reboot-needed=true -file path=kernel/misc/strategy group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/vuid2ps2 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/strmod/$(ARCH64)/vuidm3p group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/vuidm4p group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/vuidm5p group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/vuid2ps2 group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/vuid3ps2 group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/vuidm3p group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/vuidm4p group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/vuidm5p group=sys mode=0755 reboot-needed=true +file path=kernel/drv/ncrs.conf group=sys +file path=kernel/misc/$(ARCH64)/dadk group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/gda group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/strategy group=sys mode=0755 +file path=kernel/misc/dadk group=sys mode=0755 +file path=kernel/misc/gda group=sys mode=0755 +file path=kernel/misc/strategy group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/vuid2ps2 group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/vuidm3p group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/vuidm4p group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/vuidm5p group=sys mode=0755 +file path=kernel/strmod/vuid2ps2 group=sys mode=0755 +file path=kernel/strmod/vuid3ps2 group=sys mode=0755 +file path=kernel/strmod/vuidm3p group=sys mode=0755 +file path=kernel/strmod/vuidm4p group=sys mode=0755 +file path=kernel/strmod/vuidm5p group=sys mode=0755 legacy pkg=SUNWpsdcr arch=$(ARCH) category=system \ desc="Platform Support, Bus-independent Device Drivers, (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-management-bmc.mf b/usr/src/pkg/manifests/driver-management-bmc.mf index cb9c434968..2c03cc5513 100644 --- a/usr/src/pkg/manifests/driver-management-bmc.mf +++ b/usr/src/pkg/manifests/driver-management-bmc.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/management/bmc@$(PKGVERS) set name=pkg.description value="IPMI Baseboard Management Controller" set name=pkg.summary value="IPMI Baseboard Management Controller" -set name=info.classification value=org.opensolaris.category.2008:Drivers/System +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/System set name=org.opensolaris.redist value=nonredist set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-afe.mf b/usr/src/pkg/manifests/driver-network-afe.mf index 2fa7d0e532..5c7c851ea5 100644 --- a/usr/src/pkg/manifests/driver-network-afe.mf +++ b/usr/src/pkg/manifests/driver-network-afe.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/afe@$(PKGVERS) set name=pkg.description \ value="ADMtek/Infineon Fast Ethernet Network Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="ADMtek Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-amd8111s.mf b/usr/src/pkg/manifests/driver-network-amd8111s.mf index 12c04c24cd..8aa376d75c 100644 --- a/usr/src/pkg/manifests/driver-network-amd8111s.mf +++ b/usr/src/pkg/manifests/driver-network-amd8111s.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/amd8111s@$(PKGVERS) set name=pkg.description value="AMD8111 FAST Ethernet Network Adapter Driver" set name=pkg.summary value="AMD8111 Fast Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-arbel.mf b/usr/src/pkg/manifests/driver-network-arbel.mf index 38ad4f6d80..8180586d96 100644 --- a/usr/src/pkg/manifests/driver-network-arbel.mf +++ b/usr/src/pkg/manifests/driver-network-arbel.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/arbel@$(PKGVERS) set name=pkg.description value="Arbel HCA Driver" set name=pkg.summary value="Sun IB Arbel HCA driver" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-arn.mf b/usr/src/pkg/manifests/driver-network-arn.mf index 680882b156..9a5ec08066 100644 --- a/usr/src/pkg/manifests/driver-network-arn.mf +++ b/usr/src/pkg/manifests/driver-network-arn.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/arn@$(PKGVERS) set name=pkg.description value="Atheros AR9xxx 802.11 Wireless NIC Driver" set name=pkg.summary value="Atheros IEEE 802.11 Wireless NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-atge.mf b/usr/src/pkg/manifests/driver-network-atge.mf index ddb090817b..ee8a894a70 100644 --- a/usr/src/pkg/manifests/driver-network-atge.mf +++ b/usr/src/pkg/manifests/driver-network-atge.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/atge@$(PKGVERS) set name=pkg.description value="Atheros/Attansic L1E Gigabit Ethernet" set name=pkg.summary \ @@ -37,7 +36,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-ath.mf b/usr/src/pkg/manifests/driver-network-ath.mf index d4b962b199..0e6ba71c19 100644 --- a/usr/src/pkg/manifests/driver-network-ath.mf +++ b/usr/src/pkg/manifests/driver-network-ath.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ath@$(PKGVERS) set name=pkg.description value="Atheros AR52xx 802.11b/g Wireless NIC Driver" set name=pkg.summary value="Atheros 802.11b/g Wireless NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-atu.mf b/usr/src/pkg/manifests/driver-network-atu.mf index 2acf6588e0..1e661b8678 100644 --- a/usr/src/pkg/manifests/driver-network-atu.mf +++ b/usr/src/pkg/manifests/driver-network-atu.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/atu@$(PKGVERS) set name=pkg.description \ value="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-bfe.mf b/usr/src/pkg/manifests/driver-network-bfe.mf index c48d238bd3..18ffdc8084 100644 --- a/usr/src/pkg/manifests/driver-network-bfe.mf +++ b/usr/src/pkg/manifests/driver-network-bfe.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/bfe@$(PKGVERS) set name=pkg.description value="Broadcom BCM4401 Fast Ethernet Driver" set name=pkg.summary value="Broadcom BCM4401 Fast Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-bge.mf b/usr/src/pkg/manifests/driver-network-bge.mf index 3e7811f081..dd42aa8a35 100644 --- a/usr/src/pkg/manifests/driver-network-bge.mf +++ b/usr/src/pkg/manifests/driver-network-bge.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/bge@$(PKGVERS) set name=pkg.description \ value="Broadcom 57xx Gigabit Ethernet Network Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Broadcom 57xx GE NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -119,7 +117,7 @@ $(sparc_ONLY)driver name=bge clone_perms="bge 0666 root sys" \ alias=pciex14e4,167b file path=kernel/drv/$(ARCH64)/bge group=sys $(i386_ONLY)file path=kernel/drv/bge group=sys -file path=kernel/drv/bge.conf group=sys reboot-needed=false +file path=kernel/drv/bge.conf group=sys legacy pkg=SUNWbge arch=$(ARCH) category=system \ desc="Broadcom 57xx Gigabit Ethernet Network Adapter Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-bnx.mf b/usr/src/pkg/manifests/driver-network-bnx.mf index c822f2d843..dc6cb9606b 100644 --- a/usr/src/pkg/manifests/driver-network-bnx.mf +++ b/usr/src/pkg/manifests/driver-network-bnx.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/bnx@$(PKGVERS) set name=pkg.description \ value="Broadcom NetXtreme II Gigabit Ethernet PCI-X/PCIE Adapter Driver" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -54,8 +52,7 @@ driver name=bnx perms="* 0644 root sys" \ file path=kernel/drv/$(ARCH64)/bnx group=sys file path=kernel/drv/bnx group=sys file path=kernel/drv/bnx.conf group=sys \ - original_name=BRCMbnx:kernel/drv/bnx.conf preserve=renamenew \ - reboot-needed=false + original_name=BRCMbnx:kernel/drv/bnx.conf preserve=renamenew legacy pkg=BRCMbnx arch=$(ARCH) category=system \ desc="Broadcom NetXtreme II Gigabit Ethernet PCI-X/PCIE Adapter Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-bnxe.mf b/usr/src/pkg/manifests/driver-network-bnxe.mf index ac7f708840..b4c5928142 100644 --- a/usr/src/pkg/manifests/driver-network-bnxe.mf +++ b/usr/src/pkg/manifests/driver-network-bnxe.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/bnxe@$(PKGVERS) set name=pkg.description \ value="Broadcom NetXtreme II 10 Gigabit Ethernet PCI-X/PCIE Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Broadcom NetXtreme II 10GbE NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -51,8 +49,7 @@ driver name=bnxe perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/bnxe group=sys file path=kernel/drv/bnxe group=sys file path=kernel/drv/bnxe.conf group=sys \ - original_name=BRCMbnxe:kernel/drv/bnxe.conf preserve=renameold \ - reboot-needed=false + original_name=BRCMbnxe:kernel/drv/bnxe.conf preserve=renameold legacy pkg=BRCMbnxe arch=$(ARCH) category=system \ desc="Broadcom NetXtreme II 10 Gigabit Ethernet PCI-X/PCIE Adapter Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-bpf.mf b/usr/src/pkg/manifests/driver-network-bpf.mf index cd14a1997d..a57d6bc2a5 100644 --- a/usr/src/pkg/manifests/driver-network-bpf.mf +++ b/usr/src/pkg/manifests/driver-network-bpf.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/network/bpf@$(PKGVERS) @@ -30,36 +29,25 @@ set name=pkg.summary value="Solaris Kernel Packet" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/net dir path=usr/include/netpacket -dir path=usr/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=usr/kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=usr/kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=usr/kernel/socketmod group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=usr/kernel/socketmod/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=usr/kernel group=sys +dir path=usr/kernel/drv group=sys +dir path=usr/kernel/drv/$(ARCH64) group=sys +dir path=usr/kernel/socketmod group=sys +dir path=usr/kernel/socketmod/$(ARCH64) group=sys driver name=bpf perms="bpf 0666 root sys" file path=usr/include/net/bpf.h file path=usr/include/net/bpfdesc.h file path=usr/include/net/dlt.h file path=usr/include/netpacket/packet.h -file path=usr/kernel/drv/$(ARCH64)/bpf group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=usr/kernel/drv/bpf group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=usr/kernel/drv/bpf.conf group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=usr/kernel/socketmod/$(ARCH64)/sockpfp group=sys mode=0755 \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)file path=usr/kernel/socketmod/sockpfp group=sys mode=0755 \ - opensolaris.zone=global variant.opensolaris.zone=global +file path=usr/kernel/drv/$(ARCH64)/bpf group=sys +$(i386_ONLY)file path=usr/kernel/drv/bpf group=sys +file path=usr/kernel/drv/bpf.conf group=sys +file path=usr/kernel/socketmod/$(ARCH64)/sockpfp group=sys mode=0755 +$(i386_ONLY)file path=usr/kernel/socketmod/sockpfp group=sys mode=0755 legacy pkg=SUNWpacketh arch=$(ARCH) category=system \ desc="C header files for BPF/PF_PACKET" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-chxge.mf b/usr/src/pkg/manifests/driver-network-chxge.mf index 65a7c037d5..88e75cbd17 100644 --- a/usr/src/pkg/manifests/driver-network-chxge.mf +++ b/usr/src/pkg/manifests/driver-network-chxge.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/chxge@$(PKGVERS) set name=pkg.description \ value="Chelsio N110 10 Gigabit Ethernet Network Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Chelsio N110 10GE NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-dmfe.mf b/usr/src/pkg/manifests/driver-network-dmfe.mf index c43a672ed0..c003df50bc 100644 --- a/usr/src/pkg/manifests/driver-network-dmfe.mf +++ b/usr/src/pkg/manifests/driver-network-dmfe.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/dmfe@$(PKGVERS) set name=pkg.description \ value="Davicom 9102 Fast Ethernet Network Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Davicom 9102 Fast Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-e1000g.mf b/usr/src/pkg/manifests/driver-network-e1000g.mf index ecaa7ed2dc..3a817bee4b 100644 --- a/usr/src/pkg/manifests/driver-network-e1000g.mf +++ b/usr/src/pkg/manifests/driver-network-e1000g.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/e1000g@$(PKGVERS) set name=pkg.description value="Intel(R) PRO/1000 Server Adapter Driver" set name=pkg.summary value="Intel(R) PRO/1000 Server Adapter Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -188,8 +186,7 @@ driver name=e1000g clone_perms="e1000g 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/e1000g group=sys $(i386_ONLY)file path=kernel/drv/e1000g group=sys file path=kernel/drv/e1000g.conf group=sys \ - original_name=SUNWintgige:kernel/drv/e1000g.conf preserve=renamenew \ - reboot-needed=false + original_name=SUNWintgige:kernel/drv/e1000g.conf preserve=renamenew legacy pkg=SUNWintgige arch=$(ARCH) category=system \ desc="Intel(R) PRO/1000 Server Adapter Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-elxl.mf b/usr/src/pkg/manifests/driver-network-elxl.mf index ba53905369..a5e2697c1e 100644 --- a/usr/src/pkg/manifests/driver-network-elxl.mf +++ b/usr/src/pkg/manifests/driver-network-elxl.mf @@ -20,24 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/elxl@$(PKGVERS) -set name=pkg.description \ - value="3Com Etherlink XL Ethernet Driver" +set name=pkg.description value="3Com Etherlink XL Ethernet Driver" set name=pkg.summary value="3Com Etherlink XL Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-emlxs.mf b/usr/src/pkg/manifests/driver-network-emlxs.mf index f286945c90..5620bc6706 100644 --- a/usr/src/pkg/manifests/driver-network-emlxs.mf +++ b/usr/src/pkg/manifests/driver-network-emlxs.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/network/emlxs@$(PKGVERS) @@ -33,23 +32,14 @@ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking \ value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc/emlxs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc/emlxs/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/kmdb group=sys +dir path=kernel/kmdb/$(ARCH64) group=sys +dir path=kernel/misc group=sys +dir path=kernel/misc/emlxs group=sys +dir path=kernel/misc/emlxs/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/mdb group=sys @@ -79,25 +69,16 @@ driver name=emlxs class=fibre-channel perms="* 0666 root sys" \ driver name=oce perms="* 0666 root sys" \ alias=pciex19a2,700 \ alias=pciex19a2,710 -file path=kernel/drv/$(ARCH64)/emlxs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/oce group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/emlxs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/emlxs.conf group=sys opensolaris.zone=global \ - original_name=SUNWemlxs:kernel/drv/emlxs.conf preserve=true \ - reboot-needed=false variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/oce group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/emlxs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/emlxs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/emlxs/$(ARCH64)/emlxs_fw group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/emlxs/emlxs_fw group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/emlxs group=sys +file path=kernel/drv/$(ARCH64)/oce group=sys +$(i386_ONLY)file path=kernel/drv/emlxs group=sys +file path=kernel/drv/emlxs.conf group=sys \ + original_name=SUNWemlxs:kernel/drv/emlxs.conf preserve=true +$(i386_ONLY)file path=kernel/drv/oce group=sys +file path=kernel/kmdb/$(ARCH64)/emlxs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/emlxs group=sys mode=0555 +file path=kernel/misc/emlxs/$(ARCH64)/emlxs_fw group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/emlxs/emlxs_fw group=sys mode=0755 file path=usr/lib/mdb/kvm/$(ARCH64)/emlxs.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/emlxs.so group=sys mode=0555 legacy pkg=SUNWemlxs arch=$(ARCH) category=system \ diff --git a/usr/src/pkg/manifests/driver-network-eri.mf b/usr/src/pkg/manifests/driver-network-eri.mf index c2b7d973d6..e783c6fe2e 100644 --- a/usr/src/pkg/manifests/driver-network-eri.mf +++ b/usr/src/pkg/manifests/driver-network-eri.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/eri@$(PKGVERS) set name=pkg.description value="Sun RIO 10/100 Mb Ethernet Drivers" set name=pkg.summary value="Sun RIO 10/100 Mb Ethernet Drivers" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-fcip.mf b/usr/src/pkg/manifests/driver-network-fcip.mf index 6e49e9a20d..e287a4f647 100644 --- a/usr/src/pkg/manifests/driver-network-fcip.mf +++ b/usr/src/pkg/manifests/driver-network-fcip.mf @@ -20,29 +20,28 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fcip@$(PKGVERS) -set name=pkg.description value="Sun FCIP IP/ARP over FibreChannel Device Driver" +set name=pkg.description \ + value="Sun FCIP IP/ARP over FibreChannel Device Driver" set name=pkg.summary value="Sun FCIP IP/ARP over FibreChannel Device Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=fcip perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fcip group=sys $(i386_ONLY)file path=kernel/drv/fcip group=sys -file path=kernel/drv/fcip.conf group=sys reboot-needed=false +file path=kernel/drv/fcip.conf group=sys legacy pkg=SUNWfcip arch=$(ARCH) category=system \ desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-fcoe.mf b/usr/src/pkg/manifests/driver-network-fcoe.mf index e88ba469f8..d1fe09a91b 100644 --- a/usr/src/pkg/manifests/driver-network-fcoe.mf +++ b/usr/src/pkg/manifests/driver-network-fcoe.mf @@ -20,30 +20,29 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fcoe@$(PKGVERS) set name=pkg.description \ value="Sun FCoE (Fibre Channel over Ethernet) Transport Driver" set name=pkg.summary value="Sun FCoE Transport Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=fcoe perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fcoe group=sys $(i386_ONLY)file path=kernel/drv/fcoe group=sys -file path=kernel/drv/fcoe.conf group=sys reboot-needed=false +file path=kernel/drv/fcoe.conf group=sys legacy pkg=SUNWfcoe arch=$(ARCH) category=system \ desc="Sun FCoE (Fibre Channel over Ethernet) Transport Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-fcoei.mf b/usr/src/pkg/manifests/driver-network-fcoei.mf index 7544485e5f..e587ff4094 100644 --- a/usr/src/pkg/manifests/driver-network-fcoei.mf +++ b/usr/src/pkg/manifests/driver-network-fcoei.mf @@ -20,30 +20,29 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fcoei@$(PKGVERS) set name=pkg.description \ value="Sun FCoE (Fibre Channel over Ethernet) Initiator Driver" set name=pkg.summary value="Sun FCoE Initiator Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=fcoei perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fcoei group=sys $(i386_ONLY)file path=kernel/drv/fcoei group=sys -file path=kernel/drv/fcoei.conf group=sys reboot-needed=false +file path=kernel/drv/fcoei.conf group=sys legacy pkg=SUNWfcoei arch=$(ARCH) category=system \ desc="Sun FCoE (Fibre Channel over Ethernet) Initiator Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-fcoet.mf b/usr/src/pkg/manifests/driver-network-fcoet.mf index fd6d831b42..2126e89314 100644 --- a/usr/src/pkg/manifests/driver-network-fcoet.mf +++ b/usr/src/pkg/manifests/driver-network-fcoet.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fcoet@$(PKGVERS) set name=pkg.description \ value="Sun FCoE (Fibre Channel over Ethernet) COMSTAR Driver" set name=pkg.summary value="Sun FCoE COMSTAR Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-fcp.mf b/usr/src/pkg/manifests/driver-network-fcp.mf index 1a95a07c84..a0b42f876c 100644 --- a/usr/src/pkg/manifests/driver-network-fcp.mf +++ b/usr/src/pkg/manifests/driver-network-fcp.mf @@ -20,29 +20,28 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fcp@$(PKGVERS) set name=pkg.description value="Sun FCP SCSI Fibre Channel Device Driver" set name=pkg.summary value="Sun FCP SCSI Device Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=fcp perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fcp group=sys $(i386_ONLY)file path=kernel/drv/fcp group=sys -file path=kernel/drv/fcp.conf group=sys reboot-needed=false +file path=kernel/drv/fcp.conf group=sys legacy pkg=SUNWfcp arch=$(ARCH) category=system \ desc="Sun FCP SCSI Fibre Channel Device Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-fcsm.mf b/usr/src/pkg/manifests/driver-network-fcsm.mf index a14323f535..4e27a80ac6 100644 --- a/usr/src/pkg/manifests/driver-network-fcsm.mf +++ b/usr/src/pkg/manifests/driver-network-fcsm.mf @@ -20,30 +20,30 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fcsm@$(PKGVERS) set name=pkg.description value="Provides the FCSM driver" set name=pkg.summary value="FCSM driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=fcsm perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fcsm group=sys $(i386_ONLY)file path=kernel/drv/fcsm group=sys -file path=kernel/drv/fcsm.conf group=sys reboot-needed=false -legacy pkg=SUNWfcsm arch=$(ARCH) category=system desc="Provides the FCSM driver" \ +file path=kernel/drv/fcsm.conf group=sys +legacy pkg=SUNWfcsm arch=$(ARCH) category=system \ + desc="Provides the FCSM driver" \ hotline="Please contact your local service provider" name="FCSM driver" \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/driver-network-fp.mf b/usr/src/pkg/manifests/driver-network-fp.mf index afe8fae9e2..c27cbf4cb5 100644 --- a/usr/src/pkg/manifests/driver-network-fp.mf +++ b/usr/src/pkg/manifests/driver-network-fp.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/fp@$(PKGVERS) set name=pkg.description value="fctl module and fp device driver" set name=pkg.summary value="Sun Fibre Channel Transport layer" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,10 +43,10 @@ dir path=kernel/misc/$(ARCH64) group=sys driver name=fp perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fp group=sys $(i386_ONLY)file path=kernel/drv/fp group=sys -file path=kernel/drv/fp.conf group=sys original_name=SUNWfctl:kernel/drv/fp.conf \ - preserve=true reboot-needed=false -file path=kernel/misc/$(ARCH64)/fctl group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/fctl group=sys mode=0755 reboot-needed=true +file path=kernel/drv/fp.conf group=sys \ + original_name=SUNWfctl:kernel/drv/fp.conf preserve=true +file path=kernel/misc/$(ARCH64)/fctl group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/fctl group=sys mode=0755 legacy pkg=SUNWfctl arch=$(ARCH) category=system \ desc="fctl module and fp device driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-hermon.mf b/usr/src/pkg/manifests/driver-network-hermon.mf index 8111348282..ecf56f70f7 100644 --- a/usr/src/pkg/manifests/driver-network-hermon.mf +++ b/usr/src/pkg/manifests/driver-network-hermon.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/hermon@$(PKGVERS) set name=pkg.description value="Hermon HCA driver" set name=pkg.summary value="Sun IB Hermon HCA driver" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -47,7 +45,7 @@ driver name=hermon perms="* 0666 root sys" \ alias=pciex15b3,673c file path=kernel/drv/$(ARCH64)/hermon group=sys $(i386_ONLY)file path=kernel/drv/hermon group=sys -file path=kernel/drv/hermon.conf group=sys reboot-needed=false +file path=kernel/drv/hermon.conf group=sys legacy pkg=SUNWhermon arch=$(ARCH) category=system desc="Hermon HCA driver" \ hotline="Please contact your local service provider" \ name="Sun IB Hermon HCA driver" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/driver-network-hme.mf b/usr/src/pkg/manifests/driver-network-hme.mf index 50bbc34ee9..8b793676bd 100644 --- a/usr/src/pkg/manifests/driver-network-hme.mf +++ b/usr/src/pkg/manifests/driver-network-hme.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/hme@$(PKGVERS) set name=pkg.description value="SunSwift Adapter Drivers" set name=pkg.summary value="SunSwift Adapter Drivers" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -47,7 +45,8 @@ $(i386_ONLY)driver name=hme alias=pci108e,1001 $(sparc_ONLY)file path=kernel/drv/$(ARCH64)/fas group=sys file path=kernel/drv/$(ARCH64)/hme group=sys $(i386_ONLY)file path=kernel/drv/hme group=sys -legacy pkg=SUNWhmd arch=$(ARCH) category=system desc="SunSwift Adapter Drivers" \ +legacy pkg=SUNWhmd arch=$(ARCH) category=system \ + desc="SunSwift Adapter Drivers" \ hotline="Please contact your local service provider" \ name="SunSwift Adapter Drivers" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-network-hxge.mf b/usr/src/pkg/manifests/driver-network-hxge.mf index efc6e4c1c8..77cf6c0667 100644 --- a/usr/src/pkg/manifests/driver-network-hxge.mf +++ b/usr/src/pkg/manifests/driver-network-hxge.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/hxge@$(PKGVERS) set name=pkg.description value="SUN 10Gb hxge Ethernet Network Adapter Driver" set name=pkg.summary value="SUN 10Gb hxge NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -45,8 +43,7 @@ $(sparc_ONLY)driver name=hxge alias=pciex108e,aaaa perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/hxge group=sys $(i386_ONLY)file path=kernel/drv/hxge group=sys file path=kernel/drv/hxge.conf group=sys \ - original_name=SUNWhxge:kernel/drv/hxge.conf preserve=renamenew \ - reboot-needed=false + original_name=SUNWhxge:kernel/drv/hxge.conf preserve=renamenew legacy pkg=SUNWhxge arch=$(ARCH) category=system \ desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-ib.mf b/usr/src/pkg/manifests/driver-network-ib.mf index 02942d2b9a..78083ab2fd 100644 --- a/usr/src/pkg/manifests/driver-network-ib.mf +++ b/usr/src/pkg/manifests/driver-network-ib.mf @@ -24,17 +24,17 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ib@$(PKGVERS) set name=pkg.description value="Sun InfiniBand Framework" set name=pkg.summary value="Sun InfiniBand Framework" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,15 +44,15 @@ driver name=ib perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/ib group=sys $(i386_ONLY)file path=kernel/drv/ib group=sys file path=kernel/drv/ib.conf group=sys original_name=SUNWib:kernel/drv/ib.conf \ - preserve=renameold reboot-needed=false -file path=kernel/misc/$(ARCH64)/ibcm group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/ibdm group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/ibmf group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/ibtl group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ibcm group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ibdm group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ibmf group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ibtl group=sys mode=0755 reboot-needed=true + preserve=renameold +file path=kernel/misc/$(ARCH64)/ibcm group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/ibdm group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/ibmf group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/ibtl group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ibcm group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ibdm group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ibmf group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ibtl group=sys mode=0755 legacy pkg=SUNWib arch=$(ARCH) category=system desc="Sun InfiniBand Framework" \ hotline="Please contact your local service provider" \ name="Sun InfiniBand Framework" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/driver-network-ibd.mf b/usr/src/pkg/manifests/driver-network-ibd.mf index ae61bd0a35..d30182a1a7 100644 --- a/usr/src/pkg/manifests/driver-network-ibd.mf +++ b/usr/src/pkg/manifests/driver-network-ibd.mf @@ -24,13 +24,12 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ibd@0.5.11,5.11-0.139 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/driver/network/ibp@0.5.11,5.11-0.139 type=require diff --git a/usr/src/pkg/manifests/driver-network-ibdma.mf b/usr/src/pkg/manifests/driver-network-ibdma.mf index bc487822a5..062f4a2196 100644 --- a/usr/src/pkg/manifests/driver-network-ibdma.mf +++ b/usr/src/pkg/manifests/driver-network-ibdma.mf @@ -20,27 +20,26 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ibdma@$(PKGVERS) set name=pkg.description value="Sun InfiniBand Device Management Agent" set name=pkg.summary value="Sun InfiniBand Device Management Agent" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/ibdma group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ibdma group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/ibdma group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ibdma group=sys mode=0755 legacy pkg=SUNWibdmar arch=$(ARCH) category=system \ desc="Sun InfiniBand Device Management Agent (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-ibp.mf b/usr/src/pkg/manifests/driver-network-ibp.mf index 06c18f38ed..3cb506f708 100644 --- a/usr/src/pkg/manifests/driver-network-ibp.mf +++ b/usr/src/pkg/manifests/driver-network-ibp.mf @@ -24,41 +24,38 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ibp@$(PKGVERS) set name=pkg.description value="Sun IP over InfiniBand" set name=pkg.summary value="Sun IP over InfiniBand" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal - dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/method +dir path=sbin group=sys driver name=ibp alias=ib.ipib clone_perms="ibp 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/ibp group=sys $(i386_ONLY)file path=kernel/drv/ibp group=sys file path=kernel/drv/ibp.conf group=sys \ original_name=SUNWipoib:kernel/drv/ibd.conf preserve=renameold - -dir path=lib -dir path=lib/svc -dir path=lib/svc/method -file path=lib/svc/method/ibd-post-upgrade mode=0555 -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys file path=lib/svc/manifest/network/ibd-post-upgrade.xml group=sys mode=0444 - -dir path=sbin group=sys -file path=sbin/ibd_upgrade mode=0555 +file path=lib/svc/method/ibd-post-upgrade mode=0555 file path=sbin/ibd_delete_link mode=0555 - -legacy pkg=SUNWipoib arch=$(ARCH) category=system desc="Sun IP over InfiniBand" \ +file path=sbin/ibd_upgrade mode=0555 +legacy pkg=SUNWipoib arch=$(ARCH) category=system \ + desc="Sun IP over InfiniBand" \ hotline="Please contact your local service provider" \ name="Sun IP over InfiniBand" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-network-igb.mf b/usr/src/pkg/manifests/driver-network-igb.mf index 4b897219c5..c2828377b3 100644 --- a/usr/src/pkg/manifests/driver-network-igb.mf +++ b/usr/src/pkg/manifests/driver-network-igb.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/igb@$(PKGVERS) set name=pkg.description value="Intel 82575 1Gb PCI Express NIC Driver" set name=pkg.summary value="Intel 82575 1Gb PCI Express NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -59,8 +57,7 @@ driver name=igb clone_perms="igb 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/igb group=sys $(i386_ONLY)file path=kernel/drv/igb group=sys file path=kernel/drv/igb.conf group=sys \ - original_name=SUNWigb:kernel/drv/igb.conf preserve=renamenew \ - reboot-needed=false + original_name=SUNWigb:kernel/drv/igb.conf preserve=renamenew legacy pkg=SUNWigb arch=$(ARCH) category=system \ desc="Intel 82575 1Gb PCI Express NIC Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-ipw.mf b/usr/src/pkg/manifests/driver-network-ipw.mf index 45277fa9dd..ca32812e4f 100644 --- a/usr/src/pkg/manifests/driver-network-ipw.mf +++ b/usr/src/pkg/manifests/driver-network-ipw.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ipw@$(PKGVERS) set name=pkg.description value="Intel Pro. Wirless 802.11b IPW2100B Driver" set name=pkg.summary value="Intel Pro. Wireless 802.11b IPW2100B Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-iwh.mf b/usr/src/pkg/manifests/driver-network-iwh.mf index 423b60701c..5d4528df97 100644 --- a/usr/src/pkg/manifests/driver-network-iwh.mf +++ b/usr/src/pkg/manifests/driver-network-iwh.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/iwh@$(PKGVERS) set name=pkg.description value="Intel(R) WiFi Link 5100/5300 driver" set name=pkg.summary value="Intel(R) WiFi Link 5100/5300 driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -55,8 +53,8 @@ file path=kernel/drv/iwh group=sys legacy pkg=SUNWiwh arch=$(ARCH) category=system \ desc="Intel(R) WiFi Link 5100/5300 driver" \ hotline="Please contact your local service provider" \ - name="Intel(R) WiFi Link 5100/5300 driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Intel(R) WiFi Link 5100/5300 driver" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license uts/common/io/iwh/THIRDPARTYLICENSE \ license=uts/common/io/iwh/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-iwi.mf b/usr/src/pkg/manifests/driver-network-iwi.mf index ce635904b9..d7428b1656 100644 --- a/usr/src/pkg/manifests/driver-network-iwi.mf +++ b/usr/src/pkg/manifests/driver-network-iwi.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/iwi@$(PKGVERS) set name=pkg.description \ value="Intel Pro. Wirless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-iwk.mf b/usr/src/pkg/manifests/driver-network-iwk.mf index 7cd9c8246b..cc4440a729 100644 --- a/usr/src/pkg/manifests/driver-network-iwk.mf +++ b/usr/src/pkg/manifests/driver-network-iwk.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/iwk@$(PKGVERS) set name=pkg.description value="Intel(R) PRO/Wireless 4965AGN driver" set name=pkg.summary value="Intel(R) PRO/Wireless 4965AGN driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -48,9 +46,10 @@ file path=kernel/drv/iwk group=sys legacy pkg=SUNWiwk arch=$(ARCH) category=system \ desc="Intel(R) PRO/Wireless 4965AGN driver" \ hotline="Please contact your local service provider" \ - name="Intel(R) PRO/Wireless 4965AGN driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Intel(R) PRO/Wireless 4965AGN driver" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license uts/common/io/iwk/THIRDPARTYLICENSE \ license=uts/common/io/iwk/THIRDPARTYLICENSE -license uts/common/io/iwk/fw-iw/LICENSE license=uts/common/io/iwk/fw-iw/LICENSE +license uts/common/io/iwk/fw-iw/LICENSE \ + license=uts/common/io/iwk/fw-iw/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-iwp.mf b/usr/src/pkg/manifests/driver-network-iwp.mf index 3953aff9dd..2cde5defb8 100644 --- a/usr/src/pkg/manifests/driver-network-iwp.mf +++ b/usr/src/pkg/manifests/driver-network-iwp.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/iwp@$(PKGVERS) set name=pkg.description value="Intel(R) WiFi Link 6000 series driver" set name=pkg.summary value="Intel(R) WiFi Link 6000 series driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -57,4 +55,5 @@ legacy pkg=SUNWiwp arch=$(ARCH) category=system \ license cr_Sun license=cr_Sun license uts/common/io/iwp/THIRDPARTYLICENSE \ license=uts/common/io/iwp/THIRDPARTYLICENSE -license uts/common/io/iwp/fw-iw/LICENSE license=uts/common/io/iwp/fw-iw/LICENSE +license uts/common/io/iwp/fw-iw/LICENSE \ + license=uts/common/io/iwp/fw-iw/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-ixgb.mf b/usr/src/pkg/manifests/driver-network-ixgb.mf index a081a12dc2..6657fe6387 100644 --- a/usr/src/pkg/manifests/driver-network-ixgb.mf +++ b/usr/src/pkg/manifests/driver-network-ixgb.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ixgb@$(PKGVERS) set name=pkg.description value="Intel(R) PRO/10G Server Adapter Driver" set name=pkg.summary value="Intel(R) PRO/10G Server Adapter Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-ixgbe.mf b/usr/src/pkg/manifests/driver-network-ixgbe.mf index b3589661e0..c78ec79f36 100644 --- a/usr/src/pkg/manifests/driver-network-ixgbe.mf +++ b/usr/src/pkg/manifests/driver-network-ixgbe.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ixgbe@$(PKGVERS) set name=pkg.description value="Intel 10GbE PCIE NIC Driver" set name=pkg.summary value="Intel 10GbE PCIE NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -65,8 +63,7 @@ driver name=ixgbe clone_perms="ixgbe 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/ixgbe group=sys $(i386_ONLY)file path=kernel/drv/ixgbe group=sys file path=kernel/drv/ixgbe.conf group=sys \ - original_name=SUNWixgbe:kernel/drv/ixgbe.conf preserve=renamenew \ - reboot-needed=false + original_name=SUNWixgbe:kernel/drv/ixgbe.conf preserve=renamenew legacy pkg=SUNWixgbe arch=$(ARCH) category=system \ desc="Intel 10GbE PCIE NIC Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-llc2.mf b/usr/src/pkg/manifests/driver-network-llc2.mf index c9f45767d6..537c51d6c4 100644 --- a/usr/src/pkg/manifests/driver-network-llc2.mf +++ b/usr/src/pkg/manifests/driver-network-llc2.mf @@ -20,10 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/llc2@$(PKGVERS) set name=pkg.description \ value="LLC2 driver implementing IEEE 802.2 Logical Link Control 2 service" @@ -31,22 +36,14 @@ set name=pkg.summary value="LLC2 driver and its initialization programs" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/init.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/llc2 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/llc2/default group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc0.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc1.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc2.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rcS.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/init.d group=sys +dir path=etc/llc2 group=sys +dir path=etc/llc2/default group=sys +dir path=etc/rc0.d group=sys +dir path=etc/rc1.d group=sys +dir path=etc/rc2.d group=sys +dir path=etc/rcS.d group=sys dir path=usr group=sys dir path=usr/include dir path=usr/include/sys @@ -56,11 +53,9 @@ dir path=usr/kernel/drv/$(ARCH64) group=sys dir path=usr/lib dir path=usr/lib/llc2 driver name=llc2 perms="* 0666 root sys" -file path=etc/init.d/llc2 group=sys mode=0744 opensolaris.zone=global \ - original_name=SUNWllc:etc/init.d/llc2 preserve=true \ - variant.opensolaris.zone=global -file path=etc/llc2/llc2_start.default group=sys mode=0744 \ - opensolaris.zone=global variant.opensolaris.zone=global +file path=etc/init.d/llc2 group=sys mode=0744 \ + original_name=SUNWllc:etc/init.d/llc2 preserve=true +file path=etc/llc2/llc2_start.default group=sys mode=0744 file path=usr/kernel/drv/$(ARCH64)/llc2 group=sys $(i386_ONLY)file path=usr/kernel/drv/llc2 group=sys file path=usr/kernel/drv/llc2.conf group=sys @@ -72,14 +67,10 @@ file path=usr/lib/llc2/llc2_loop4 mode=0555 file path=usr/lib/llc2/llc2_stats mode=0555 file path=usr/lib/llc2/llc2_tcap mode=0555 file path=usr/lib/llc2/llc2_tparser mode=0555 -hardlink path=etc/rc0.d/K52llc2 opensolaris.zone=global \ - target=../../etc/init.d/llc2 variant.opensolaris.zone=global -hardlink path=etc/rc1.d/K52llc2 opensolaris.zone=global \ - target=../../etc/init.d/llc2 variant.opensolaris.zone=global -hardlink path=etc/rc2.d/S40llc2 opensolaris.zone=global \ - target=../../etc/init.d/llc2 variant.opensolaris.zone=global -hardlink path=etc/rcS.d/K52llc2 opensolaris.zone=global \ - target=../../etc/init.d/llc2 variant.opensolaris.zone=global +hardlink path=etc/rc0.d/K52llc2 target=../../etc/init.d/llc2 +hardlink path=etc/rc1.d/K52llc2 target=../../etc/init.d/llc2 +hardlink path=etc/rc2.d/S40llc2 target=../../etc/init.d/llc2 +hardlink path=etc/rcS.d/K52llc2 target=../../etc/init.d/llc2 legacy pkg=SUNWllc arch=$(ARCH) category=system \ desc="LLC2 driver implementing IEEE 802.2 Logical Link Control 2 service" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-mwl.mf b/usr/src/pkg/manifests/driver-network-mwl.mf index 9f8b21dcea..83bfefa798 100644 --- a/usr/src/pkg/manifests/driver-network-mwl.mf +++ b/usr/src/pkg/manifests/driver-network-mwl.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/mwl@$(PKGVERS) set name=pkg.description \ value="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -49,8 +47,8 @@ driver name=mwl clone_perms="mwl 0666 root sys" perms="* 0666 root sys" \ alias=pci11ab,2a24 file path=kernel/drv/$(ARCH64)/mwl group=sys file path=kernel/drv/mwl group=sys -file path=kernel/misc/$(ARCH64)/mwlfw group=sys mode=0755 reboot-needed=true -file path=kernel/misc/mwlfw group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/mwlfw group=sys mode=0755 +file path=kernel/misc/mwlfw group=sys mode=0755 legacy pkg=SUNWmwl arch=$(ARCH) category=system \ desc="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-mxfe.mf b/usr/src/pkg/manifests/driver-network-mxfe.mf index ba1739fa19..4a9a97122d 100644 --- a/usr/src/pkg/manifests/driver-network-mxfe.mf +++ b/usr/src/pkg/manifests/driver-network-mxfe.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/mxfe@$(PKGVERS) set name=pkg.description value="Macronix Fast Ethernet Network Adapter Driver" set name=pkg.summary value="Macronix Fast Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-myri10ge.mf b/usr/src/pkg/manifests/driver-network-myri10ge.mf index b5123a5971..1f8caf0933 100644 --- a/usr/src/pkg/manifests/driver-network-myri10ge.mf +++ b/usr/src/pkg/manifests/driver-network-myri10ge.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/myri10ge@$(PKGVERS) set name=pkg.description value="Myricom 10 Gigabit Ethernet Adapter Driver" set name=pkg.summary value="Myricom 10Gb NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-nge.mf b/usr/src/pkg/manifests/driver-network-nge.mf index 68b88a7e1b..84f9bfa9db 100644 --- a/usr/src/pkg/manifests/driver-network-nge.mf +++ b/usr/src/pkg/manifests/driver-network-nge.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/nge@$(PKGVERS) set name=pkg.description value="Nvidia CK8-04 GE driver" set name=pkg.summary value="Nvidia CK8-04 GE driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -57,7 +55,7 @@ driver name=nge clone_perms="nge 0666 root sys" perms="* 0666 root sys" \ alias=pci10de,e6 file path=kernel/drv/$(ARCH64)/nge group=sys file path=kernel/drv/nge group=sys -file path=kernel/drv/nge.conf group=sys reboot-needed=false +file path=kernel/drv/nge.conf group=sys legacy pkg=SUNWnge arch=$(ARCH) category=system desc="Nvidia CK8-04 GE driver" \ hotline="Please contact your local service provider" \ name="Nvidia CK8-04 GE driver" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/driver-network-niumx.mf b/usr/src/pkg/manifests/driver-network-niumx.mf index 42152ce995..bb982c7665 100644 --- a/usr/src/pkg/manifests/driver-network-niumx.mf +++ b/usr/src/pkg/manifests/driver-network-niumx.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/niumx@$(PKGVERS) set name=pkg.description value="UltraSPARC-T2 NIU nexus driver" set name=pkg.summary value="UltraSPARC-T2 NIU nexus driver" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/sun4v group=sys dir path=platform/sun4v/kernel group=sys diff --git a/usr/src/pkg/manifests/driver-network-ntxn.mf b/usr/src/pkg/manifests/driver-network-ntxn.mf index d0335fdf97..9d6d545d98 100644 --- a/usr/src/pkg/manifests/driver-network-ntxn.mf +++ b/usr/src/pkg/manifests/driver-network-ntxn.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ntxn@$(PKGVERS) set name=pkg.description value="NetXen 1Gb/10Gb Ethernet Adapter Driver" set name=pkg.summary value="NetXen 1Gb/10Gb NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -51,7 +49,7 @@ driver name=ntxn \ alias=pci4040,5 file path=kernel/drv/$(ARCH64)/ntxn group=sys file path=kernel/drv/ntxn group=sys -file path=kernel/drv/ntxn.conf group=sys reboot-needed=false +file path=kernel/drv/ntxn.conf group=sys legacy pkg=SUNWntxn arch=$(ARCH) category=system \ desc="NetXen 1Gb/10Gb Ethernet Adapter Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-nxge.mf b/usr/src/pkg/manifests/driver-network-nxge.mf index 037a05641d..4119b0eae8 100644 --- a/usr/src/pkg/manifests/driver-network-nxge.mf +++ b/usr/src/pkg/manifests/driver-network-nxge.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/nxge@$(PKGVERS) $(sparc_ONLY)set name=pkg.description value="Sun NIU 10Gb/1Gb driver" $(i386_ONLY)set name=pkg.description value="Sun NIU 10Gb/1Gb leaf driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Sun NIU leaf driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(i386_ONLY)dir path=kernel group=sys $(i386_ONLY)dir path=kernel/drv group=sys $(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys @@ -61,16 +59,15 @@ $(i386_ONLY)driver name=nxge perms="* 0600 root sys" \ $(i386_ONLY)file path=kernel/drv/$(ARCH64)/nxge group=sys $(i386_ONLY)file path=kernel/drv/nxge group=sys $(i386_ONLY)file path=kernel/drv/nxge.conf group=sys \ - original_name=SUNWnxge:kernel/drv/nxge.conf preserve=renamenew \ - reboot-needed=false + original_name=SUNWnxge:kernel/drv/nxge.conf preserve=renamenew $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/nxge group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/nxge.conf group=sys \ original_name=SUNWnxge:platform/sun4u/kernel/drv/nxge.conf \ - preserve=renamenew reboot-needed=false + preserve=renamenew $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/nxge group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/nxge.conf group=sys \ original_name=SUNWnxge:platform/sun4v/kernel/drv/nxge.conf \ - preserve=renamenew reboot-needed=false + preserve=renamenew $(i386_ONLY)legacy pkg=SUNWnxge arch=$(ARCH) category=system \ desc="Sun NIU 10Gb/1Gb leaf driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-ofk.mf b/usr/src/pkg/manifests/driver-network-ofk.mf index d9460137af..a94807e857 100644 --- a/usr/src/pkg/manifests/driver-network-ofk.mf +++ b/usr/src/pkg/manifests/driver-network-ofk.mf @@ -24,30 +24,31 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ofk@$(PKGVERS) -set name=pkg.description value="The Solaris Open Fabrics kernel components package provides support of the OFED defined kernel RDMA KPI, as well as providing kernel modules to facilitate OFED userland libraries." +set name=pkg.description \ + value="The Solaris Open Fabrics kernel components package provides support of the OFED defined kernel RDMA KPI, as well as providing kernel modules to facilitate OFED userland libraries." set name=pkg.summary value="Solaris Open Fabrics kernel components" -set name=info.classification value=org.opensolaris.category.2010:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2010:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -driver name=sol_uverbs perms="* 0666 root sys" driver name=sol_ucma perms="* 0666 root sys" -file path=kernel/drv/$(ARCH64)/sol_uverbs group=sys +driver name=sol_uverbs perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/sol_ucma group=sys -$(i386_ONLY)file path=kernel/drv/sol_uverbs group=sys +file path=kernel/drv/$(ARCH64)/sol_uverbs group=sys $(i386_ONLY)file path=kernel/drv/sol_ucma group=sys -file path=kernel/drv/sol_uverbs.conf group=sys file path=kernel/drv/sol_ucma.conf group=sys +$(i386_ONLY)file path=kernel/drv/sol_uverbs group=sys +file path=kernel/drv/sol_uverbs.conf group=sys file path=kernel/misc/$(ARCH64)/sol_ofs group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/sol_ofs group=sys mode=0755 license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/driver-network-pcan.mf b/usr/src/pkg/manifests/driver-network-pcan.mf index 5fb1e65626..f746132cbf 100644 --- a/usr/src/pkg/manifests/driver-network-pcan.mf +++ b/usr/src/pkg/manifests/driver-network-pcan.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/pcan@$(PKGVERS) set name=pkg.description value="Cisco-Aironet 802.11b driver" set name=pkg.summary value="Cisco-Aironet 802.11b driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-pcwl.mf b/usr/src/pkg/manifests/driver-network-pcwl.mf index 6403a520ce..657093b2dd 100644 --- a/usr/src/pkg/manifests/driver-network-pcwl.mf +++ b/usr/src/pkg/manifests/driver-network-pcwl.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/pcwl@$(PKGVERS) set name=pkg.description value="Lucent/PRISM-II 802.11b driver" set name=pkg.summary value="Lucent/PRISM-II 802.11b driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-platform.mf b/usr/src/pkg/manifests/driver-network-platform.mf index 5e1fae9d60..de4aa52ff5 100644 --- a/usr/src/pkg/manifests/driver-network-platform.mf +++ b/usr/src/pkg/manifests/driver-network-platform.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/platform@$(PKGVERS) set name=pkg.description value="Platform Support, OS Functionality" set name=pkg.summary value="Platform Support, OS Functionality" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=kernel group=sys dir path=kernel/drv group=sys @@ -182,8 +180,7 @@ file path=kernel/drv/iprb group=sys file path=kernel/drv/pcn group=sys file path=kernel/drv/sd group=sys file path=kernel/drv/sd.conf group=sys \ - original_name=SUNWos86r:kernel/drv/sd.conf preserve=true \ - reboot-needed=false + original_name=SUNWos86r:kernel/drv/sd.conf preserve=true legacy pkg=SUNWos86r arch=$(ARCH) category=system \ desc="Platform Support, OS Functionality (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-qfe.mf b/usr/src/pkg/manifests/driver-network-qfe.mf index 7b3a78242f..4338d03b76 100644 --- a/usr/src/pkg/manifests/driver-network-qfe.mf +++ b/usr/src/pkg/manifests/driver-network-qfe.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/qfe@$(PKGVERS) set name=pkg.description value="Sun Quad FastEtherent PCI/SBus Adapter" set name=pkg.summary value="Sun Quad FastEthernet Adapter Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -45,7 +43,7 @@ file path=kernel/drv/$(ARCH64)/qfe group=sys legacy pkg=SUNWqfed arch=$(ARCH) category=system \ desc="Sun Quad FastEtherent PCI/SBus Adapter" \ hotline="Please contact your local service provider" \ - name="Sun Quad FastEthernet Adapter Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun Quad FastEthernet Adapter Driver" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-qlc-qlc-mdb.mf b/usr/src/pkg/manifests/driver-network-qlc-qlc-mdb.mf index 117cf1e0bb..2d554b1c33 100644 --- a/usr/src/pkg/manifests/driver-network-qlc-qlc-mdb.mf +++ b/usr/src/pkg/manifests/driver-network-qlc-qlc-mdb.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/network/qlc/qlc-mdb@0.5.11,5.11-0.134 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/developer/debug/mdb/module/module-qlc@0.5.11,5.11-0.134 type=require +depend fmri=pkg:/developer/debug/mdb/module/module-qlc@0.5.11,5.11-0.134 \ + type=require diff --git a/usr/src/pkg/manifests/driver-network-qlc.mf b/usr/src/pkg/manifests/driver-network-qlc.mf index cf820725f2..7905b8e43d 100644 --- a/usr/src/pkg/manifests/driver-network-qlc.mf +++ b/usr/src/pkg/manifests/driver-network-qlc.mf @@ -20,24 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/qlc@$(PKGVERS) set name=pkg.description \ value="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" set name=pkg.summary \ value="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -70,32 +69,20 @@ file path=kernel/drv/$(ARCH64)/qlc group=sys file path=kernel/drv/$(ARCH64)/qlge group=sys $(i386_ONLY)file path=kernel/drv/qlc group=sys file path=kernel/drv/qlc.conf group=sys \ - original_name=SUNWqlc:kernel/drv/qlc.conf preserve=true reboot-needed=false + original_name=SUNWqlc:kernel/drv/qlc.conf preserve=true $(i386_ONLY)file path=kernel/drv/qlge group=sys -file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2200 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2300 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2400 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2500 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_6322 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_8100 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2200 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2300 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2400 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2500 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_6322 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_8100 group=sys mode=0755 \ - reboot-needed=true +file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2200 group=sys mode=0755 +file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2300 group=sys mode=0755 +file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2400 group=sys mode=0755 +file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2500 group=sys mode=0755 +file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_6322 group=sys mode=0755 +file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_8100 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2200 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2300 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2400 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2500 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_6322 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_8100 group=sys mode=0755 legacy pkg=SUNWqlc arch=$(ARCH) category=system \ desc="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-ral.mf b/usr/src/pkg/manifests/driver-network-ral.mf index 896a7eec31..4600abb8c2 100644 --- a/usr/src/pkg/manifests/driver-network-ral.mf +++ b/usr/src/pkg/manifests/driver-network-ral.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ral@$(PKGVERS) set name=pkg.description value="Ralink RT2500 802.11b/g Wireless Driver" set name=pkg.summary value="Ralink RT2500 802.11b/g Wireless Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-rds.mf b/usr/src/pkg/manifests/driver-network-rds.mf index aa1ea60fd6..7fcfa0a07d 100644 --- a/usr/src/pkg/manifests/driver-network-rds.mf +++ b/usr/src/pkg/manifests/driver-network-rds.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rds@$(PKGVERS) set name=pkg.description value="Sun Reliable Datagram Sockets" set name=pkg.summary value="Sun Reliable Datagram Sockets" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,9 +43,9 @@ driver name=rdsib perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/rds group=sys file path=kernel/drv/$(ARCH64)/rdsib group=sys $(i386_ONLY)file path=kernel/drv/rds group=sys -file path=kernel/drv/rds.conf group=sys reboot-needed=false +file path=kernel/drv/rds.conf group=sys $(i386_ONLY)file path=kernel/drv/rdsib group=sys -file path=kernel/drv/rdsib.conf group=sys reboot-needed=false +file path=kernel/drv/rdsib.conf group=sys legacy pkg=SUNWrds arch=$(ARCH) category=system \ desc="Sun Reliable Datagram Sockets" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-rdsv3.mf b/usr/src/pkg/manifests/driver-network-rdsv3.mf index 802015fae3..e65ee79b44 100644 --- a/usr/src/pkg/manifests/driver-network-rdsv3.mf +++ b/usr/src/pkg/manifests/driver-network-rdsv3.mf @@ -24,33 +24,33 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rdsv3@$(PKGVERS) -set name=pkg.description value="The RDS driver is an implementation of the Reliable Datagram Sockets API. It provides reliable, in-order datagram and RDMA data delivery between sockets." +set name=pkg.description \ + value="The RDS driver is an implementation of the Reliable Datagram Sockets API. It provides reliable, in-order datagram and RDMA data delivery between sockets." set name=pkg.summary value="Solaris Reliable Datagram Sockets" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/socketmod group=sys +dir path=kernel/socketmod/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib group=bin dir path=usr/lib/rcm group=bin dir path=usr/lib/rcm/scripts group=bin -file path=/usr/lib/rcm/scripts/SUNW,rdsv3u.sh group=bin mode=0555 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys driver name=rdsv3 perms="* 0644 root sys" -$(i386_ONLY)file path=kernel/drv/rdsv3 group=sys file path=kernel/drv/$(ARCH64)/rdsv3 group=sys +$(i386_ONLY)file path=kernel/drv/rdsv3 group=sys file path=kernel/drv/rdsv3.conf group=sys preserve=renamenew -dir path=kernel/socketmod group=sys -dir path=kernel/socketmod/$(ARCH64) group=sys -$(i386_ONLY)file path=kernel/socketmod/sockrds mode=0755 group=sys -file path=kernel/socketmod/$(ARCH64)/sockrds mode=0755 group=sys +file path=kernel/socketmod/$(ARCH64)/sockrds group=sys mode=0755 +$(i386_ONLY)file path=kernel/socketmod/sockrds group=sys mode=0755 +file path=usr/lib/rcm/scripts/SUNW,rdsv3u.sh group=bin mode=0555 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license uts/common/io/ib/clients/rdsv3/LICENSE \ diff --git a/usr/src/pkg/manifests/driver-network-rge.mf b/usr/src/pkg/manifests/driver-network-rge.mf index b0b310de4f..89072ae964 100644 --- a/usr/src/pkg/manifests/driver-network-rge.mf +++ b/usr/src/pkg/manifests/driver-network-rge.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rge@$(PKGVERS) -set name=pkg.description value="Realtek Gigabit Ethernet Network Adapter Driver" +set name=pkg.description \ + value="Realtek Gigabit Ethernet Network Adapter Driver" set name=pkg.summary value="Realtek Gigabit Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-rpcib.mf b/usr/src/pkg/manifests/driver-network-rpcib.mf index 5bab7d58a5..c926134ad3 100644 --- a/usr/src/pkg/manifests/driver-network-rpcib.mf +++ b/usr/src/pkg/manifests/driver-network-rpcib.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rpcib@$(PKGVERS) set name=pkg.description \ value="InfiniBand plugin implementation of RPC over RDMA" set name=pkg.summary value="InfiniBand plugin to RPC over RDMA" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,8 +43,7 @@ driver name=rpcib perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/rpcib group=sys $(i386_ONLY)file path=kernel/drv/rpcib group=sys file path=kernel/drv/rpcib.conf group=sys \ - original_name=SUNWrpcib:kernel/drv/rpcib.conf preserve=true \ - reboot-needed=false + original_name=SUNWrpcib:kernel/drv/rpcib.conf preserve=true legacy pkg=SUNWrpcib arch=$(ARCH) category=system \ desc="InfiniBand plugin implementation of RPC over RDMA" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-rtls.mf b/usr/src/pkg/manifests/driver-network-rtls.mf index 1b548c7ad7..0487a7a008 100644 --- a/usr/src/pkg/manifests/driver-network-rtls.mf +++ b/usr/src/pkg/manifests/driver-network-rtls.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rtls@$(PKGVERS) set name=pkg.description value="RTL Fast NIC" set name=pkg.summary value="REALTEK Fast NIC" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-rtw.mf b/usr/src/pkg/manifests/driver-network-rtw.mf index 47bd1515f6..822a6f9170 100644 --- a/usr/src/pkg/manifests/driver-network-rtw.mf +++ b/usr/src/pkg/manifests/driver-network-rtw.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rtw@$(PKGVERS) set name=pkg.description value="realtek 8180L 802.11b driver" set name=pkg.summary value="realtek 8180L 802.11b driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-rum.mf b/usr/src/pkg/manifests/driver-network-rum.mf index 920937cc63..660c9d66d7 100644 --- a/usr/src/pkg/manifests/driver-network-rum.mf +++ b/usr/src/pkg/manifests/driver-network-rum.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rum@$(PKGVERS) set name=pkg.description \ value="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-rwd.mf b/usr/src/pkg/manifests/driver-network-rwd.mf index c63e8b5650..7a63f28101 100644 --- a/usr/src/pkg/manifests/driver-network-rwd.mf +++ b/usr/src/pkg/manifests/driver-network-rwd.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rwd@$(PKGVERS) set name=pkg.description \ value="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-rwn.mf b/usr/src/pkg/manifests/driver-network-rwn.mf index d0c686544a..20e760b5d9 100644 --- a/usr/src/pkg/manifests/driver-network-rwn.mf +++ b/usr/src/pkg/manifests/driver-network-rwn.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/rwn@$(PKGVERS) set name=pkg.description \ value="Ralink RT2700/RT2800 IEEE802.11 a/b/g/n Wireless Network Device" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-sdp.mf b/usr/src/pkg/manifests/driver-network-sdp.mf index f33eac10bb..6afaf8da74 100644 --- a/usr/src/pkg/manifests/driver-network-sdp.mf +++ b/usr/src/pkg/manifests/driver-network-sdp.mf @@ -20,22 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/sdp@$(PKGVERS) -set name=pkg.description value="Sun InfiniBand layered Sockets Direct Protocol" +set name=pkg.description \ + value="Sun InfiniBand layered Sockets Direct Protocol" set name=pkg.summary value="Sun InfiniBand layered Sockets Direct Protocol" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=kernel group=sys dir path=kernel/drv group=sys @@ -47,11 +47,9 @@ file path=etc/sdp.conf group=sys original_name=SUNWibsdp:etc/sdp.conf \ preserve=true file path=kernel/drv/$(ARCH64)/sdp group=sys $(i386_ONLY)file path=kernel/drv/sdp group=sys -file path=kernel/drv/sdp.conf group=sys reboot-needed=false -file path=kernel/socketmod/$(ARCH64)/socksdp group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/socketmod/socksdp group=sys mode=0755 \ - reboot-needed=true +file path=kernel/drv/sdp.conf group=sys +file path=kernel/socketmod/$(ARCH64)/socksdp group=sys mode=0755 +$(i386_ONLY)file path=kernel/socketmod/socksdp group=sys mode=0755 legacy pkg=SUNWibsdp arch=$(ARCH) category=system \ desc="Sun InfiniBand layered Sockets Direct Protocol" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-sdpib.mf b/usr/src/pkg/manifests/driver-network-sdpib.mf index fdd7883055..d8d1dc6001 100644 --- a/usr/src/pkg/manifests/driver-network-sdpib.mf +++ b/usr/src/pkg/manifests/driver-network-sdpib.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/sdpib@$(PKGVERS) set name=pkg.description value="Sun InfiniBand Sockets Direct Protocol" set name=pkg.summary value="Sun InfiniBand Sockets Direct Protocol" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,7 +43,7 @@ dir path=kernel/strmod/$(ARCH64) group=sys driver name=sdpib perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/sdpib group=sys $(i386_ONLY)file path=kernel/drv/sdpib group=sys -file path=kernel/drv/sdpib.conf group=sys reboot-needed=false +file path=kernel/drv/sdpib.conf group=sys hardlink path=kernel/strmod/$(ARCH64)/sdpib \ target=../../../kernel/drv/$(ARCH64)/sdpib $(i386_ONLY)hardlink path=kernel/strmod/sdpib target=../../kernel/drv/sdpib diff --git a/usr/src/pkg/manifests/driver-network-sfe.mf b/usr/src/pkg/manifests/driver-network-sfe.mf index 32a9bdf755..4a90c4909e 100644 --- a/usr/src/pkg/manifests/driver-network-sfe.mf +++ b/usr/src/pkg/manifests/driver-network-sfe.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/sfe@$(PKGVERS) set name=pkg.description \ value="SiS900 series Fast Ethernet Network Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="SiS900 Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-socal.mf b/usr/src/pkg/manifests/driver-network-socal.mf index 7ad8e35846..03ad7d59c1 100644 --- a/usr/src/pkg/manifests/driver-network-socal.mf +++ b/usr/src/pkg/manifests/driver-network-socal.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/socal@$(PKGVERS) set name=pkg.description \ value="Sun Enterprise Network Array socal Device Driver" set name=pkg.summary value="Sun Enterprise Network Array socal Device Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-spwr.mf b/usr/src/pkg/manifests/driver-network-spwr.mf index 8ae7b368cf..2784e1d17a 100644 --- a/usr/src/pkg/manifests/driver-network-spwr.mf +++ b/usr/src/pkg/manifests/driver-network-spwr.mf @@ -27,4 +27,3 @@ set name=pkg.fmri value=pkg:/driver/network/spwr@0.5.11,5.11-0.141 set name=pkg.obsolete value=true set name=org.opensolaris.redist value=nonredist set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/driver-network-srpt.mf b/usr/src/pkg/manifests/driver-network-srpt.mf index 31dd8c8edf..a13de491ea 100644 --- a/usr/src/pkg/manifests/driver-network-srpt.mf +++ b/usr/src/pkg/manifests/driver-network-srpt.mf @@ -26,22 +26,21 @@ set name=pkg.fmri value=pkg:/driver/network/srpt@$(PKGVERS) set name=pkg.description value="Sun SRP COMSTAR Port Provider" set name=pkg.summary value="Sun SRP COMSTAR Port Provider" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/kmdb group=sys +dir path=kernel/kmdb/$(ARCH64) group=sys +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system/ibsrp group=sys \ variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/include dir path=usr/lib @@ -50,25 +49,15 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system/ibsrp group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=srpt perms="* 0644 root sys" -file path=kernel/drv/$(ARCH64)/srpt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/srpt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/srpt.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/srpt group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/srpt group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=lib/svc/method/svc-srpt mode=0555 opensolaris.zone=global \ +file path=kernel/drv/$(ARCH64)/srpt group=sys +$(i386_ONLY)file path=kernel/drv/srpt group=sys +file path=kernel/drv/srpt.conf group=sys +file path=kernel/kmdb/$(ARCH64)/srpt group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/srpt group=sys mode=0555 +file path=lib/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \ variant.opensolaris.zone=global +file path=lib/svc/method/svc-srpt mode=0555 variant.opensolaris.zone=global file path=usr/include/libsrpt.h file path=usr/lib/$(ARCH64)/libsrpt.so.1 file path=usr/lib/$(ARCH64)/llib-lsrpt.ln @@ -78,15 +67,11 @@ file path=usr/lib/llib-lsrpt.ln file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/srpt.so group=sys mode=0555 file path=usr/sbin/srptadm mode=0555 -file path=lib/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -link path=usr/lib/libsrpt.so target=libsrpt.so.1 -link path=usr/lib/$(ARCH64)/libsrpt.so target=libsrpt.so.1 legacy pkg=SUNWsrptr arch=$(ARCH) category=system \ desc="Sun SRP COMSTAR Port Provider (Root)" \ hotline="Please contact your local service provider" \ - name="Sun SRP COMSTAR Port Provider (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun SRP COMSTAR Port Provider (Root)" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 legacy pkg=SUNWsrptu arch=$(ARCH) category=system \ desc="Sun SRP COMSTAR Port Provider utilities (Usr)" \ hotline="Please contact your local service provider" \ @@ -94,3 +79,5 @@ legacy pkg=SUNWsrptu arch=$(ARCH) category=system \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +link path=usr/lib/$(ARCH64)/libsrpt.so target=libsrpt.so.1 +link path=usr/lib/libsrpt.so target=libsrpt.so.1 diff --git a/usr/src/pkg/manifests/driver-network-tavor.mf b/usr/src/pkg/manifests/driver-network-tavor.mf index 7e7559b98a..3087c4de53 100644 --- a/usr/src/pkg/manifests/driver-network-tavor.mf +++ b/usr/src/pkg/manifests/driver-network-tavor.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/tavor@$(PKGVERS) set name=pkg.description value="Tavor HCA driver" set name=pkg.summary value="Sun Tavor HCA driver" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -49,7 +47,7 @@ driver name=tavor perms="* 0666 root sys" \ alias=pciex15b3,6279 file path=kernel/drv/$(ARCH64)/tavor group=sys $(i386_ONLY)file path=kernel/drv/tavor group=sys -file path=kernel/drv/tavor.conf group=sys reboot-needed=false +file path=kernel/drv/tavor.conf group=sys legacy pkg=SUNWtavor arch=$(ARCH) category=system desc="Tavor HCA driver" \ hotline="Please contact your local service provider" \ name="Sun Tavor HCA driver" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/driver-network-uath.mf b/usr/src/pkg/manifests/driver-network-uath.mf index c5ded7f951..7fe8aa77f0 100644 --- a/usr/src/pkg/manifests/driver-network-uath.mf +++ b/usr/src/pkg/manifests/driver-network-uath.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/uath@$(PKGVERS) set name=pkg.description \ value="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" @@ -38,7 +37,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -51,8 +49,8 @@ driver name=uath clone_perms="uath 0666 root sys" perms="* 0666 root sys" \ alias=usbcf3,3 file path=kernel/drv/$(ARCH64)/uath group=sys file path=kernel/drv/uath group=sys -file path=kernel/misc/$(ARCH64)/uathfw group=sys mode=0755 reboot-needed=true -file path=kernel/misc/uathfw group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/uathfw group=sys mode=0755 +file path=kernel/misc/uathfw group=sys mode=0755 legacy pkg=SUNWuath arch=$(ARCH) category=system \ desc="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-network-ural.mf b/usr/src/pkg/manifests/driver-network-ural.mf index 6d025432f0..72627bc1a5 100644 --- a/usr/src/pkg/manifests/driver-network-ural.mf +++ b/usr/src/pkg/manifests/driver-network-ural.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/ural@$(PKGVERS) set name=pkg.description value="Ralink RT2500USB 802.11b/g Wireless Driver" set name=pkg.summary value="Ralink RT2500USB 802.11b/g Wireless Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-urtw.mf b/usr/src/pkg/manifests/driver-network-urtw.mf index eeb2f1fc94..87a8d89250 100644 --- a/usr/src/pkg/manifests/driver-network-urtw.mf +++ b/usr/src/pkg/manifests/driver-network-urtw.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/urtw@$(PKGVERS) set name=pkg.description \ value="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-usbecm.mf b/usr/src/pkg/manifests/driver-network-usbecm.mf index 77607a3856..71b5d617a5 100644 --- a/usr/src/pkg/manifests/driver-network-usbecm.mf +++ b/usr/src/pkg/manifests/driver-network-usbecm.mf @@ -20,29 +20,28 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/usbecm@$(PKGVERS) set name=pkg.description value="CDC ECM USB-to-Ethernet driver" set name=pkg.summary value="CDC ECM USB-to-Ethernet driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Networking +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=usbecm perms="* 0666 root sys" \ alias=usb,class2.6.0 \ - alias=usbif,class2.6 \ - alias=usb430,a4a2 + alias=usb430,a4a2 \ + alias=usbif,class2.6 file path=kernel/drv/$(ARCH64)/usbecm group=sys $(i386_ONLY)file path=kernel/drv/usbecm group=sys license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/driver-network-vr.mf b/usr/src/pkg/manifests/driver-network-vr.mf index 21613db3c2..cec4be76e3 100644 --- a/usr/src/pkg/manifests/driver-network-vr.mf +++ b/usr/src/pkg/manifests/driver-network-vr.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/vr@$(PKGVERS) set name=pkg.description value="VIA Rhine Fast Ethernet driver" set name=pkg.summary value="VIA Rhine Fast Ethernet driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-wpi.mf b/usr/src/pkg/manifests/driver-network-wpi.mf index cad3e790ee..bf84657b33 100644 --- a/usr/src/pkg/manifests/driver-network-wpi.mf +++ b/usr/src/pkg/manifests/driver-network-wpi.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/wpi@$(PKGVERS) set name=pkg.description value="Intel(R) PRO/Wireless 3945ABG driver" set name=pkg.summary value="Intel(R) PRO/Wireless 3945ABG driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -60,8 +58,8 @@ file path=kernel/drv/wpi group=sys legacy pkg=SUNWwpi arch=$(ARCH) category=system \ desc="Intel(R) PRO/Wireless 3945ABG driver" \ hotline="Please contact your local service provider" \ - name="Intel(R) PRO/Wireless 3945ABG driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Intel(R) PRO/Wireless 3945ABG driver" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license uts/common/io/wpi/THIRDPARTYLICENSE \ license=uts/common/io/wpi/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-xge.mf b/usr/src/pkg/manifests/driver-network-xge.mf index 57ed30f021..133d84e17f 100644 --- a/usr/src/pkg/manifests/driver-network-xge.mf +++ b/usr/src/pkg/manifests/driver-network-xge.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/xge@$(PKGVERS) set name=pkg.description \ value="Neterion Xframe (I/II) 10 Gigabit Ethernet Adapter Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Xframe 10GE NIC Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-yge.mf b/usr/src/pkg/manifests/driver-network-yge.mf index 90993f4758..8e397a7db4 100644 --- a/usr/src/pkg/manifests/driver-network-yge.mf +++ b/usr/src/pkg/manifests/driver-network-yge.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/yge@$(PKGVERS) set name=pkg.description \ value="Marvell Yukon 2 Gigabit Ethernet Controller Driver" @@ -37,7 +36,6 @@ set name=pkg.summary value="Marvell Yukon 2 Gigabit Ethernet Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-network-zyd.mf b/usr/src/pkg/manifests/driver-network-zyd.mf index 9046d91282..f72cd933da 100644 --- a/usr/src/pkg/manifests/driver-network-zyd.mf +++ b/usr/src/pkg/manifests/driver-network-zyd.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/network/zyd@$(PKGVERS) set name=pkg.description value="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" set name=pkg.summary value="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-pcmcia.mf b/usr/src/pkg/manifests/driver-pcmcia.mf index 8402316479..c68faa009a 100644 --- a/usr/src/pkg/manifests/driver-pcmcia.mf +++ b/usr/src/pkg/manifests/driver-pcmcia.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/pcmcia@$(PKGVERS) set name=pkg.description \ value="kernel modules and start-up files for PCMCIA card services" set name=pkg.summary value="PCMCIA Card Services" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -47,7 +46,7 @@ driver name=pcs file path=kernel/drv/$(ARCH64)/pcic group=sys file path=kernel/drv/$(ARCH64)/pcs group=sys $(i386_ONLY)file path=kernel/drv/pcic group=sys -file path=kernel/drv/pcic.conf group=sys reboot-needed=false +file path=kernel/drv/pcic.conf group=sys $(i386_ONLY)file path=kernel/drv/pcs group=sys legacy pkg=SUNWpcmci arch=$(ARCH) category=system \ desc="kernel modules and start-up files for PCMCIA card services" \ diff --git a/usr/src/pkg/manifests/driver-serial-pcser.mf b/usr/src/pkg/manifests/driver-serial-pcser.mf index 027add72b1..c0b262fa57 100644 --- a/usr/src/pkg/manifests/driver-serial-pcser.mf +++ b/usr/src/pkg/manifests/driver-serial-pcser.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/pcser@$(PKGVERS) set name=pkg.description value="PCMCIA serial card driver" set name=pkg.summary value="PCMCIA serial card driver" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-serial-usbftdi.mf b/usr/src/pkg/manifests/driver-serial-usbftdi.mf index 31c8034e6b..26727a24b3 100644 --- a/usr/src/pkg/manifests/driver-serial-usbftdi.mf +++ b/usr/src/pkg/manifests/driver-serial-usbftdi.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbftdi@$(PKGVERS) set name=pkg.description value="FTDI FT232R USB serial driver" set name=pkg.summary value="FT232R USB UART" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -67,11 +65,11 @@ driver name=usbftdi perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/usbftdi group=sys $(i386_ONLY)file path=kernel/drv/usbftdi group=sys file path=kernel/drv/usbftdi.conf group=sys \ - original_name=SUNWuftdi:kernel/drv/usbftdi.conf preserve=true \ - reboot-needed=false + original_name=SUNWuftdi:kernel/drv/usbftdi.conf preserve=true legacy pkg=SUNWuftdi arch=$(ARCH) category=system \ desc="FTDI FT232R USB serial driver" \ - hotline="Please contact your local service provider" name="FT232R USB UART" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="FT232R USB UART" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-serial-usbsacm.mf b/usr/src/pkg/manifests/driver-serial-usbsacm.mf index d9a04d5762..63aa90938b 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsacm.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsacm.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbsacm@$(PKGVERS) set name=pkg.description value="CDC ACM USB-to-serial driver" set name=pkg.summary value="CDC ACM USB-to-serial driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-serial-usbser.mf b/usr/src/pkg/manifests/driver-serial-usbser.mf index 58ec86d1d1..6efe582fb9 100644 --- a/usr/src/pkg/manifests/driver-serial-usbser.mf +++ b/usr/src/pkg/manifests/driver-serial-usbser.mf @@ -20,27 +20,26 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbser@$(PKGVERS) set name=pkg.description value="USB generic serial module" set name=pkg.summary value="USB generic serial module" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/usbser group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/usbser group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/usbser group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/usbser group=sys mode=0755 legacy pkg=SUNWusbs arch=$(ARCH) category=system \ desc="USB generic serial module" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf index 7516a12192..2b4bf354a6 100644 --- a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf +++ b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbser_edge@$(PKGVERS) set name=pkg.description value="USB Digi Edgeport serial driver" set name=pkg.summary value="USB Digi Edgeport serial driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -74,8 +72,7 @@ driver name=usbser_edge perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/usbser_edge group=sys $(i386_ONLY)file path=kernel/drv/usbser_edge group=sys file path=kernel/drv/usbser_edge.conf group=sys \ - original_name=SUNWuedg:kernel/drv/usbser_edge.conf preserve=true \ - reboot-needed=false + original_name=SUNWuedg:kernel/drv/usbser_edge.conf preserve=true legacy pkg=SUNWuedg arch=$(ARCH) category=system \ desc="USB Digi Edgeport serial driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf index 76452c33ec..7ec3e9e059 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf @@ -20,31 +20,29 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbsksp/usbs49_fw@$(PKGVERS) -set name=pkg.description value="USA49WLC firmware for USB Keyspan serial driver" +set name=pkg.description \ + value="USA49WLC firmware for USB Keyspan serial driver" set name=pkg.summary value="USA49WLC firmware for USB Keyspan serial driver" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys file path=kernel/misc/$(ARCH64)/usbs49_fw group=sys mode=0755 \ - original_name=SUNWukspfw:kernel/misc/$(ARCH64)/usbs49_fw preserve=true \ - reboot-needed=true + original_name=SUNWukspfw:kernel/misc/$(ARCH64)/usbs49_fw preserve=true $(i386_ONLY)file path=kernel/misc/usbs49_fw group=sys mode=0755 \ - original_name=SUNWukspfw:kernel/misc/usbs49_fw preserve=true \ - reboot-needed=true + original_name=SUNWukspfw:kernel/misc/usbs49_fw preserve=true legacy pkg=SUNWukspfw arch=$(ARCH) category=system \ desc="USA49WLC firmware for USB Keyspan serial driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp.mf b/usr/src/pkg/manifests/driver-serial-usbsksp.mf index f49a950490..d8c471f53f 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsksp.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsksp.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbsksp@$(PKGVERS) set name=pkg.description value="USB Keyspan serial driver" set name=pkg.summary value="USB Keyspan serial driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-serial-usbsprl.mf b/usr/src/pkg/manifests/driver-serial-usbsprl.mf index ce89877e43..e450f20dba 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsprl.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsprl.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/serial/usbsprl@$(PKGVERS) set name=pkg.description value="Prolific PL2303 USB-to-serial driver" set name=pkg.summary value="Prolific PL2303 USB-to-serial driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -51,7 +49,7 @@ $(i386_ONLY)file path=kernel/drv/usbsprl group=sys legacy pkg=SUNWuprl arch=$(ARCH) category=system \ desc="Prolific PL2303 USB-to-serial driver" \ hotline="Please contact your local service provider" \ - name="Prolific PL2303 USB-to-serial driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Prolific PL2303 USB-to-serial driver" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-sparc-platform.mf b/usr/src/pkg/manifests/driver-sparc-platform.mf index 9917d39917..250f051899 100644 --- a/usr/src/pkg/manifests/driver-sparc-platform.mf +++ b/usr/src/pkg/manifests/driver-sparc-platform.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/sparc/platform@$(PKGVERS) set name=pkg.description value="Drivers for the PCI bus" set name=pkg.summary value="PCI Drivers" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports \ value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -67,8 +65,8 @@ file path=kernel/drv/$(ARCH64)/ecpp group=sys file path=kernel/drv/$(ARCH64)/glm group=sys file path=kernel/drv/$(ARCH64)/mpt group=sys file path=kernel/drv/$(ARCH64)/se group=sys -file path=kernel/drv/ecpp.conf group=sys reboot-needed=false -file path=kernel/drv/mpt.conf group=sys preserve=true reboot-needed=false +file path=kernel/drv/ecpp.conf group=sys +file path=kernel/drv/mpt.conf group=sys preserve=true legacy pkg=SUNWpd arch=$(ARCH) category=system desc="Drivers for the PCI bus" \ hotline="Please contact your local service provider" name="PCI Drivers" \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-storage-aac.mf b/usr/src/pkg/manifests/driver-storage-aac.mf index d4ff9dce0a..371bfb7b3f 100644 --- a/usr/src/pkg/manifests/driver-storage-aac.mf +++ b/usr/src/pkg/manifests/driver-storage-aac.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/aac@$(PKGVERS) -set name=pkg.description value="Adaptec AdvanceRaid Controller SCSI HBA Driver" +set name=pkg.description \ + value="Adaptec AdvanceRaid Controller SCSI HBA Driver" set name=pkg.summary value="Adaptec AdvanceRaid Controller SCSI HBA Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -49,7 +48,7 @@ driver name=aac class=scsi \ file path=kernel/drv/$(ARCH64)/aac group=sys $(i386_ONLY)file path=kernel/drv/aac group=sys file path=kernel/drv/aac.conf group=sys \ - original_name=SUNWaac:kernel/drv/aac.conf preserve=true reboot-needed=false + original_name=SUNWaac:kernel/drv/aac.conf preserve=true legacy pkg=SUNWaac arch=$(ARCH) category=system \ desc="Adaptec AdvanceRaid Controller SCSI HBA Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-adpu320.mf b/usr/src/pkg/manifests/driver-storage-adpu320.mf index 4e4ba89502..6fbbea081d 100644 --- a/usr/src/pkg/manifests/driver-storage-adpu320.mf +++ b/usr/src/pkg/manifests/driver-storage-adpu320.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/adpu320@$(PKGVERS) set name=pkg.description value="Adaptec 7902 SCSI Driver" set name=pkg.summary value="Adaptec Ultra320 Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -55,7 +53,7 @@ driver name=adpu320 class=scsi perms="adpu320ctl 0666 root root" \ alias=pci9005,808f file path=kernel/drv/$(ARCH64)/adpu320 group=sys file path=kernel/drv/adpu320 group=sys -file path=kernel/drv/adpu320.conf group=sys reboot-needed=false +file path=kernel/drv/adpu320.conf group=sys legacy pkg=SUNWadpu320 arch=$(ARCH) category=system \ desc="Adaptec 7902 SCSI Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-ahci.mf b/usr/src/pkg/manifests/driver-storage-ahci.mf index ec95a33192..e02a01065e 100644 --- a/usr/src/pkg/manifests/driver-storage-ahci.mf +++ b/usr/src/pkg/manifests/driver-storage-ahci.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/ahci@$(PKGVERS) set name=pkg.description \ value="Advanced Host Controller Interface (AHCI) SATA HBA Driver" @@ -37,7 +36,6 @@ set name=pkg.summary \ value="Advanced Host Controller Interface (AHCI) SATA HBA Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-amr.mf b/usr/src/pkg/manifests/driver-storage-amr.mf index bb022d35b6..54bb8f8799 100644 --- a/usr/src/pkg/manifests/driver-storage-amr.mf +++ b/usr/src/pkg/manifests/driver-storage-amr.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/amr@$(PKGVERS) set name=pkg.description value="LSI MegaRAID SCSI HBA Driver" set name=pkg.summary value="LSI MegaRAID SCSI HBA Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -48,7 +46,7 @@ driver name=amr class=scsi \ alias=pci1028,f file path=kernel/drv/$(ARCH64)/amr group=sys file path=kernel/drv/amr group=sys -file path=kernel/drv/amr.conf group=sys reboot-needed=false +file path=kernel/drv/amr.conf group=sys legacy pkg=SUNWamr arch=$(ARCH) category=system \ desc="LSI MegaRAID SCSI HBA Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-arcmsr.mf b/usr/src/pkg/manifests/driver-storage-arcmsr.mf index 7f6244e0fd..5e7a11eac8 100644 --- a/usr/src/pkg/manifests/driver-storage-arcmsr.mf +++ b/usr/src/pkg/manifests/driver-storage-arcmsr.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/arcmsr@$(PKGVERS) set name=pkg.description value="SAS/SATA RAID driver" set name=pkg.summary value="Areca SAS/SATA RAID driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -58,7 +57,7 @@ driver name=arcmsr class=scsi perms="* 0600 root sys" \ alias=pci17d3,1681 file path=kernel/drv/$(ARCH64)/arcmsr group=sys file path=kernel/drv/arcmsr group=sys -file path=kernel/drv/arcmsr.conf group=sys reboot-needed=false +file path=kernel/drv/arcmsr.conf group=sys legacy pkg=SUNWarcmsr arch=$(ARCH) category=system desc="SAS/SATA RAID driver" \ hotline="Please contact your local service provider" \ name="Areca SAS/SATA RAID driver" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/driver-storage-ata.mf b/usr/src/pkg/manifests/driver-storage-ata.mf index 0dbdb444e1..7ada8fbc3f 100644 --- a/usr/src/pkg/manifests/driver-storage-ata.mf +++ b/usr/src/pkg/manifests/driver-storage-ata.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/ata@$(PKGVERS) set name=pkg.description value="Platform Support, ISA Bus Device Drivers" set name=pkg.summary value="Platform Support, ISA Bus Device Drivers" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -54,14 +52,13 @@ driver name=pci-ide file path=kernel/drv/$(ARCH64)/ata group=sys file path=kernel/drv/ata group=sys file path=kernel/drv/ata.conf group=sys \ - original_name=SUNWpsdir:kernel/drv/ata.conf preserve=true \ - reboot-needed=false + original_name=SUNWpsdir:kernel/drv/ata.conf preserve=true file path=platform/i86pc/kernel/drv/$(ARCH64)/pci-ide group=sys file path=platform/i86pc/kernel/drv/pci-ide group=sys -file path=platform/i86pc/kernel/drv/pci-ide.conf group=sys reboot-needed=false +file path=platform/i86pc/kernel/drv/pci-ide.conf group=sys file path=platform/i86xpv/kernel/drv/$(ARCH64)/pci-ide group=sys file path=platform/i86xpv/kernel/drv/pci-ide group=sys -file path=platform/i86xpv/kernel/drv/pci-ide.conf group=sys reboot-needed=false +file path=platform/i86xpv/kernel/drv/pci-ide.conf group=sys legacy pkg=SUNWpsdir arch=$(ARCH) category=system \ desc="Platform Support, ISA Bus Device Drivers, (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf index 7c57919aae..2d7c9e4255 100644 --- a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf +++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/bcm_sata@$(PKGVERS) set name=pkg.description value="BroadCom ht1000 sata driver" set name=pkg.summary value="BroadCom ht1000 sata driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-blkdev.mf b/usr/src/pkg/manifests/driver-storage-blkdev.mf index 298bd338e4..4177b70dfa 100644 --- a/usr/src/pkg/manifests/driver-storage-blkdev.mf +++ b/usr/src/pkg/manifests/driver-storage-blkdev.mf @@ -24,17 +24,17 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/blkdev@$(PKGVERS) set name=pkg.description value="Generic Block Driver" set name=pkg.summary value="Generic Block Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-cpqary3.mf b/usr/src/pkg/manifests/driver-storage-cpqary3.mf index 0b1d47de52..c8d267cb88 100644 --- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf +++ b/usr/src/pkg/manifests/driver-storage-cpqary3.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/cpqary3@$(PKGVERS) set name=pkg.description value="HP Smart Array HBA Driver 2.2.0.1" set name=pkg.summary value="HP Smart Array HBA Driver 2.2.0.1" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -67,7 +66,7 @@ driver name=cpqary3 class=scsi \ alias=pcie11,409d file path=kernel/drv/$(ARCH64)/cpqary3 group=sys file path=kernel/drv/cpqary3 group=sys -file path=kernel/drv/cpqary3.conf group=sys reboot-needed=false +file path=kernel/drv/cpqary3.conf group=sys legacy pkg=CPQary3 arch=$(ARCH) category=system \ desc="HP Smart Array HBA Driver 2.2.0.1" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf b/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf index 6a2612b121..f15ac5c9be 100644 --- a/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf +++ b/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/storage/fas/header-fas@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="SunSwift Adapter Headers" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys @@ -40,7 +38,8 @@ file path=usr/include/sys/scsi/adapters/fascmd.h file path=usr/include/sys/scsi/adapters/fasdma.h file path=usr/include/sys/scsi/adapters/fasreg.h file path=usr/include/sys/scsi/adapters/fasvar.h -legacy pkg=SUNWhmdu arch=$(ARCH) category=system desc="SunSwift Adapter Headers" \ +legacy pkg=SUNWhmdu arch=$(ARCH) category=system \ + desc="SunSwift Adapter Headers" \ hotline="Please contact your local service provider" \ name="SunSwift Adapter Headers" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-storage-glm.mf b/usr/src/pkg/manifests/driver-storage-glm.mf index 495875308b..2cbc3ebd22 100644 --- a/usr/src/pkg/manifests/driver-storage-glm.mf +++ b/usr/src/pkg/manifests/driver-storage-glm.mf @@ -20,29 +20,28 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/glm@$(PKGVERS) set name=pkg.description value="Drivers for the PCI bus" set name=pkg.summary value="PCI Drivers" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=glm alias=pci1000,b class=scsi perms="* 0755 root sys" file path=kernel/drv/$(ARCH64)/glm group=sys file path=kernel/drv/glm group=sys -file path=kernel/drv/glm.conf group=sys reboot-needed=false +file path=kernel/drv/glm.conf group=sys legacy pkg=SUNWpd arch=$(ARCH) category=system desc="Drivers for the PCI bus" \ hotline="Please contact your local service provider" name="PCI Drivers" \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-storage-ifp.mf b/usr/src/pkg/manifests/driver-storage-ifp.mf index a7e5b2463c..2a33404d08 100644 --- a/usr/src/pkg/manifests/driver-storage-ifp.mf +++ b/usr/src/pkg/manifests/driver-storage-ifp.mf @@ -20,24 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/ifp@$(PKGVERS) set name=pkg.description \ value="Sun FC-AL Device Driver For QLogic Fibre Channel Family" set name=pkg.summary value="Sun Fibre Channel Arbitrated Loop Device Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-isp.mf b/usr/src/pkg/manifests/driver-storage-isp.mf index 86c6163d88..63ef4b44f4 100644 --- a/usr/src/pkg/manifests/driver-storage-isp.mf +++ b/usr/src/pkg/manifests/driver-storage-isp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/storage/isp@$(PKGVERS) @@ -29,16 +28,13 @@ set name=pkg.description \ value="Emulex/QLogic Intelligent SCSI Processor driver for ISP 1000 and 1040A" set name=pkg.summary \ value="Emulex/QLogic Intelligent SCSI Processor driver for ISP 1000 and 1040A" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/include dir path=usr/include/sys @@ -52,10 +48,8 @@ driver name=isp class=scsi \ alias=QLGC,isp \ alias=SUNW,isp \ alias=SUNW,isptwo -file path=kernel/drv/$(ARCH64)/isp group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/isp group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/isp group=sys +file path=kernel/kmdb/$(ARCH64)/isp group=sys mode=0555 file path=usr/include/sys/scsi/adapters/ispcmd.h file path=usr/include/sys/scsi/adapters/ispmail.h file path=usr/include/sys/scsi/adapters/ispreg.h diff --git a/usr/src/pkg/manifests/driver-storage-lsimega.mf b/usr/src/pkg/manifests/driver-storage-lsimega.mf index 6d8b99565d..d04f980e11 100644 --- a/usr/src/pkg/manifests/driver-storage-lsimega.mf +++ b/usr/src/pkg/manifests/driver-storage-lsimega.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/lsimega@$(PKGVERS) set name=pkg.description value="LSI Hardware RAID HBA Driver" set name=pkg.summary value="LSI Hardware RAID HBA Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -49,7 +48,7 @@ driver name=lsimega class=scsi \ alias=pci1028,13 file path=kernel/drv/$(ARCH64)/lsimega group=sys file path=kernel/drv/lsimega group=sys -file path=kernel/drv/lsimega.conf group=sys reboot-needed=false +file path=kernel/drv/lsimega.conf group=sys legacy pkg=SUNWlsimega arch=$(ARCH) category=system \ desc="LSI Hardware RAID HBA Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf index 285399fa63..a6ee4d81dc 100644 --- a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf +++ b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/marvell88sx@$(PKGVERS) set name=pkg.description value="Marvell 88sx sata driver" set name=pkg.summary value="Marvell 88sx sata driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-mega_sas.mf b/usr/src/pkg/manifests/driver-storage-mega_sas.mf index 05b93b451c..17ab12c1c5 100644 --- a/usr/src/pkg/manifests/driver-storage-mega_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mega_sas.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/mega_sas@$(PKGVERS) set name=pkg.description value="LSI MegaSAS RAID Controller HBA Driver" set name=pkg.summary value="LSI MegaSAS RAID Controller HBA Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -145,7 +144,7 @@ driver name=mega_sas class=scsi \ alias=pci1028,15.1028.1f03 file path=kernel/drv/$(ARCH64)/mega_sas group=sys file path=kernel/drv/mega_sas group=sys -file path=kernel/drv/mega_sas.conf group=sys reboot-needed=false +file path=kernel/drv/mega_sas.conf group=sys legacy pkg=SUNWmegasas arch=$(ARCH) category=system \ desc="LSI MegaSAS RAID Controller HBA Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf index 1540c1b8e4..96edba508d 100644 --- a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf @@ -20,39 +20,37 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/mpt_sas@$(PKGVERS) set name=pkg.description value="LSI MPT SAS 2.0 Controller HBA Driver" set name=pkg.summary value="LSI MPT SAS 2.0 Controller HBA Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=mpt_sas class=scsi-self-identifying \ alias=pci1000,64 \ - alias=pciex1000,64 \ alias=pci1000,70 \ - alias=pciex1000,70 \ alias=pci1000,72 \ - alias=pciex1000,72 \ alias=pci1000,76 \ + alias=pciex1000,64 \ + alias=pciex1000,70 \ + alias=pciex1000,72 \ alias=pciex1000,76 file path=kernel/drv/$(ARCH64)/mpt_sas group=sys $(i386_ONLY)file path=kernel/drv/mpt_sas group=sys file path=kernel/drv/mpt_sas.conf group=sys \ - original_name=SUNWmptsas:kernel/drv/mpt_sas.conf preserve=true \ - reboot-needed=false + original_name=SUNWmptsas:kernel/drv/mpt_sas.conf preserve=true legacy pkg=SUNWmptsas arch=$(ARCH) category=system \ desc="LSI MPT SAS 2.0 Controller HBA Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.mf b/usr/src/pkg/manifests/driver-storage-mr_sas.mf index 6862c6d24e..fa4d0dde93 100644 --- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mr_sas.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/mr_sas@$(PKGVERS) set name=pkg.description value="LSI MegaRAID SAS2.0 Controller HBA Driver" set name=pkg.summary value="LSI MegaRAID SAS2.0 HBA Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -49,7 +48,7 @@ $(i386_ONLY)driver name=mr_sas class=scsi-self-identifying \ alias=pciex1000,79 file path=kernel/drv/$(ARCH64)/mr_sas group=sys $(i386_ONLY)file path=kernel/drv/mr_sas group=sys -file path=kernel/drv/mr_sas.conf group=sys reboot-needed=false +file path=kernel/drv/mr_sas.conf group=sys legacy pkg=SUNWmrsas arch=$(ARCH) category=system \ desc="LSI MegaRAID SAS2.0 Controller HBA Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-nv_sata.mf b/usr/src/pkg/manifests/driver-storage-nv_sata.mf index 93abcee9bd..1c7dc4159e 100644 --- a/usr/src/pkg/manifests/driver-storage-nv_sata.mf +++ b/usr/src/pkg/manifests/driver-storage-nv_sata.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/nv_sata@$(PKGVERS) -set name=pkg.description value="Nvidia ck804 pro / mcp55 pro combo SATA driver" +set name=pkg.description \ + value="Nvidia ck804 pro / mcp55 pro combo SATA driver" set name=pkg.summary value="Nvidia ck804 pro / mcp55 pro combo SATA driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -47,7 +46,7 @@ driver name=nv_sata class=scsi-self-identifying perms="* 0644 root sys" \ alias=pci10de,55 file path=kernel/drv/$(ARCH64)/nv_sata group=sys file path=kernel/drv/nv_sata group=sys -file path=kernel/drv/nv_sata.conf group=sys reboot-needed=false +file path=kernel/drv/nv_sata.conf group=sys legacy pkg=SUNWnvsata arch=$(ARCH) category=system \ desc="Nvidia ck804 pro / mcp55 pro combo SATA driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-pcata.mf b/usr/src/pkg/manifests/driver-storage-pcata.mf index dd0895a825..3dd2e8f27c 100644 --- a/usr/src/pkg/manifests/driver-storage-pcata.mf +++ b/usr/src/pkg/manifests/driver-storage-pcata.mf @@ -20,30 +20,29 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/pcata@$(PKGVERS) set name=pkg.description value="PCMCIA ATA card driver" set name=pkg.summary value="PCMCIA ATA card driver" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=pcata alias=pccard,disk file path=kernel/drv/$(ARCH64)/pcata group=sys $(i386_ONLY)file path=kernel/drv/pcata group=sys -legacy pkg=SUNWpsdpr arch=$(ARCH) category=system desc="PCMCIA ATA card driver" \ +legacy pkg=SUNWpsdpr arch=$(ARCH) category=system \ + desc="PCMCIA ATA card driver" \ hotline="Please contact your local service provider" \ name="PCMCIA ATA card driver" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-storage-pmcs.mf b/usr/src/pkg/manifests/driver-storage-pmcs.mf index e85dd2d284..c72333c117 100644 --- a/usr/src/pkg/manifests/driver-storage-pmcs.mf +++ b/usr/src/pkg/manifests/driver-storage-pmcs.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/pmcs@$(PKGVERS) set name=pkg.description value="PMC-Sierra SAS-2 HBA Driver" set name=pkg.summary value="PMC-Sierra SAS-2 HBA driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -54,14 +53,11 @@ driver name=pmcs alias=pciex11f8,8001 class=scsi-self-identifying \ file path=kernel/drv/$(ARCH64)/pmcs group=sys $(i386_ONLY)file path=kernel/drv/pmcs group=sys file path=kernel/drv/pmcs.conf group=sys \ - original_name=SUNWpmcs:kernel/drv/pmcs.conf preserve=true \ - reboot-needed=false -file path=kernel/kmdb/$(ARCH64)/pmcs group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/pmcs group=sys mode=0555 reboot-needed=true -file path=kernel/misc/pmcs/$(ARCH64)/pmcs8001fw group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/pmcs/pmcs8001fw group=sys mode=0755 \ - reboot-needed=true + original_name=SUNWpmcs:kernel/drv/pmcs.conf preserve=true +file path=kernel/kmdb/$(ARCH64)/pmcs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/pmcs group=sys mode=0555 +file path=kernel/misc/pmcs/$(ARCH64)/pmcs8001fw group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/pmcs/pmcs8001fw group=sys mode=0755 file path=usr/lib/mdb/kvm/$(ARCH64)/pmcs.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/pmcs.so group=sys mode=0555 legacy pkg=SUNWpmcsr arch=$(ARCH) category=system \ diff --git a/usr/src/pkg/manifests/driver-storage-qus.mf b/usr/src/pkg/manifests/driver-storage-qus.mf index f2c1f74ab6..2c182be40f 100644 --- a/usr/src/pkg/manifests/driver-storage-qus.mf +++ b/usr/src/pkg/manifests/driver-storage-qus.mf @@ -20,24 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/qus@$(PKGVERS) set name=pkg.description \ value="Software to support Qlogic Ultra3 scsi host bus adapters" set name=pkg.summary value="QLogic Ultra3 Scsi" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-sbp2.mf b/usr/src/pkg/manifests/driver-storage-sbp2.mf index dac0a3b457..bf42bfa51d 100644 --- a/usr/src/pkg/manifests/driver-storage-sbp2.mf +++ b/usr/src/pkg/manifests/driver-storage-sbp2.mf @@ -20,27 +20,26 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/sbp2@$(PKGVERS) set name=pkg.description value="Serial Bus Protocol 2 module" set name=pkg.summary value="Serial Bus Protocol 2 module" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/sbp2 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/sbp2 group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/sbp2 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/sbp2 group=sys mode=0755 legacy pkg=SUNWsbp2 arch=$(ARCH) category=system \ desc="Serial Bus Protocol 2 module" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-scsa1394.mf b/usr/src/pkg/manifests/driver-storage-scsa1394.mf index 2709d12a2a..43fac482ce 100644 --- a/usr/src/pkg/manifests/driver-storage-scsa1394.mf +++ b/usr/src/pkg/manifests/driver-storage-scsa1394.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/scsa1394@$(PKGVERS) set name=pkg.description value="IEEE 1394 mass storage driver" set name=pkg.summary value="IEEE 1394 mass storage driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-sdcard.mf b/usr/src/pkg/manifests/driver-storage-sdcard.mf index 6bff639b39..2702835df3 100644 --- a/usr/src/pkg/manifests/driver-storage-sdcard.mf +++ b/usr/src/pkg/manifests/driver-storage-sdcard.mf @@ -24,20 +24,20 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/sdcard@$(PKGVERS) set name=pkg.description value="SD/MMC Drivers" set name=pkg.summary value="SD/MMC Drivers" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage # SUNWsdcard doesn't deliver anything for sparc, but we keep delivering # the package on sparc because we can't use direct obsolete support to # obsolete only one variant. set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(i386_ONLY)dir path=kernel group=sys $(i386_ONLY)dir path=kernel/drv group=sys $(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys @@ -48,11 +48,11 @@ $(i386_ONLY)driver name=sdhost perms="* 0644 root root" \ alias=pciclass,080501 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/sdhost group=sys $(i386_ONLY)file path=kernel/drv/sdhost group=sys -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/sda group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/sda group=sys mode=0755 reboot-needed=true +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/sda group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/sda group=sys mode=0755 $(i386_ONLY)legacy pkg=SUNWsdcard arch=$(ARCH) category=system \ - desc="SD/MMC Drivers" hotline="Please contact your local service provider" \ + desc="SD/MMC Drivers" \ + hotline="Please contact your local service provider" \ name="SD/MMC Drivers" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 $(i386_ONLY)license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/driver-storage-ses.mf b/usr/src/pkg/manifests/driver-storage-ses.mf index 4f18fe0c28..829b396233 100644 --- a/usr/src/pkg/manifests/driver-storage-ses.mf +++ b/usr/src/pkg/manifests/driver-storage-ses.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/ses@$(PKGVERS) set name=pkg.description value="SCSI Enclosure Services (ses) Device Driver" set name=pkg.summary value="SCSI Enclosure Services Device Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -44,7 +42,7 @@ driver name=ses perms="* 0666 bin bin" \ alias=scsiclass,0d file path=kernel/drv/$(ARCH64)/ses group=sys $(i386_ONLY)file path=kernel/drv/ses group=sys -file path=kernel/drv/ses.conf group=sys reboot-needed=false +file path=kernel/drv/ses.conf group=sys legacy pkg=SUNWses arch=$(ARCH) category=system \ desc="SCSI Enclosure Services (ses) Device Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-sf.mf b/usr/src/pkg/manifests/driver-storage-sf.mf index e255f636b0..35431b7728 100644 --- a/usr/src/pkg/manifests/driver-storage-sf.mf +++ b/usr/src/pkg/manifests/driver-storage-sf.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/sf@$(PKGVERS) set name=pkg.description value="Sun Enterprise Network Array sf Device Driver" set name=pkg.summary value="Sun Enterprise Network Array sf Device Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/sun4u group=sys dir path=platform/sun4u/kernel group=sys @@ -43,7 +42,7 @@ dir path=platform/sun4u/kernel/drv group=sys dir path=platform/sun4u/kernel/drv/$(ARCH64) group=sys driver name=sf file path=platform/sun4u/kernel/drv/$(ARCH64)/sf group=sys -file path=platform/sun4u/kernel/drv/sf.conf group=sys reboot-needed=false +file path=platform/sun4u/kernel/drv/sf.conf group=sys legacy pkg=SUNWluxd.u arch=$(ARCH).sun4u category=system \ desc="Sun Enterprise Network Array sf Device Driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-si3124.mf b/usr/src/pkg/manifests/driver-storage-si3124.mf index 677c3bec5d..46c9df59ac 100644 --- a/usr/src/pkg/manifests/driver-storage-si3124.mf +++ b/usr/src/pkg/manifests/driver-storage-si3124.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/si3124@$(PKGVERS) set name=pkg.description value="SiliconImage 3124 sata driver" set name=pkg.summary value="SiliconImage 3124 sata driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-storage-smp.mf b/usr/src/pkg/manifests/driver-storage-smp.mf index 74a20be263..a34a82b446 100644 --- a/usr/src/pkg/manifests/driver-storage-smp.mf +++ b/usr/src/pkg/manifests/driver-storage-smp.mf @@ -20,31 +20,30 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/smp@$(PKGVERS) set name=pkg.description \ value="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" set name=pkg.summary \ value="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=smp perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/smp group=sys $(i386_ONLY)file path=kernel/drv/smp group=sys -file path=kernel/drv/smp.conf group=sys reboot-needed=false +file path=kernel/drv/smp.conf group=sys legacy pkg=SUNWsmpd arch=$(ARCH) category=system \ desc="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-storage-ssd.mf b/usr/src/pkg/manifests/driver-storage-ssd.mf index 1c3b3a76d7..94ab45f982 100644 --- a/usr/src/pkg/manifests/driver-storage-ssd.mf +++ b/usr/src/pkg/manifests/driver-storage-ssd.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/ssd@$(PKGVERS) set name=pkg.description value="ssd kernel device driver" set name=pkg.summary value="SPARCstorage Array Drivers" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -45,9 +44,9 @@ driver name=ssd perms="* 0640 root sys" \ alias=scsa,00.bvhci file path=kernel/drv/$(ARCH64)/ssd group=sys file path=kernel/drv/ssd.conf group=sys \ - original_name=SUNWssad:kernel/drv/ssd.conf preserve=true \ - reboot-needed=false -legacy pkg=SUNWssad arch=$(ARCH) category=system desc="ssd kernel device driver" \ + original_name=SUNWssad:kernel/drv/ssd.conf preserve=true +legacy pkg=SUNWssad arch=$(ARCH) category=system \ + desc="ssd kernel device driver" \ hotline="Please contact your local service provider" \ name="SPARCstorage Array Drivers" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/driver-storage-sv.mf b/usr/src/pkg/manifests/driver-storage-sv.mf index 9b521ee156..6c8e1033ec 100644 --- a/usr/src/pkg/manifests/driver-storage-sv.mf +++ b/usr/src/pkg/manifests/driver-storage-sv.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/storage/sv@$(PKGVERS) set name=pkg.description \ value="Raw/Block Device Interface to Storage Volumes (SV)" set name=pkg.summary value="Sun StorageTek Availability Suite Volume Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=kernel group=sys @@ -44,6 +43,8 @@ dir path=kernel/kmdb group=sys dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -61,14 +62,13 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys driver name=sv devlink=type=ddi_pseudo;name=sv\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/init.d/sv mode=0744 file path=etc/init.d/sv.cluster mode=0744 -file path=kernel/kmdb/$(ARCH64)/sv group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/sv group=sys mode=0555 reboot-needed=true +file path=kernel/kmdb/$(ARCH64)/sv group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sv group=sys mode=0555 +file path=lib/svc/manifest/system/nws_sv.xml group=sys mode=0444 file path=usr/bin/svadm mode=0555 file path=usr/bin/svboot mode=0555 file path=usr/cluster/sbin/sv mode=0744 @@ -77,7 +77,6 @@ $(i386_ONLY)file path=usr/kernel/drv/sv group=sys file path=usr/kernel/drv/sv.conf group=sys file path=usr/lib/mdb/kvm/$(ARCH64)/sv.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/sv.so group=sys mode=0555 -file path=lib/svc/manifest/system/nws_sv.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-sv target=../../../etc/init.d/sv hardlink path=usr/sbin/svadm target=../bin/svadm hardlink path=usr/sbin/svboot target=../bin/svboot diff --git a/usr/src/pkg/manifests/driver-usb-ugen.mf b/usr/src/pkg/manifests/driver-usb-ugen.mf index 3250f22a76..b269f30287 100644 --- a/usr/src/pkg/manifests/driver-usb-ugen.mf +++ b/usr/src/pkg/manifests/driver-usb-ugen.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/usb/ugen@$(PKGVERS) set name=pkg.description value="UGEN (USB Generic Driver)" set name=pkg.summary value="USB Generic Driver" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.mf index d651949970..685b1c2f35 100644 --- a/usr/src/pkg/manifests/driver-usb.mf +++ b/usr/src/pkg/manifests/driver-usb.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/usb@$(PKGVERS) set name=pkg.description value="USBA (USB framework) and USB Device Drivers" set name=pkg.summary value="USB Device Drivers" set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/usb group=sys dir path=kernel group=sys @@ -49,10 +47,10 @@ dir path=kernel/strmod group=sys dir path=kernel/strmod/$(ARCH64) group=sys dir path=lib dir path=lib/svc -dir path=lib/svc/method -dir path=sbin group=sys dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/method +dir path=sbin group=sys driver name=ehci alias=pciclass,0c0320 perms="* 0644 root sys" driver name=hid alias=usbif,class3 perms="* 0600 root sys" driver name=hubd alias=usbif,class9 perms="* 0644 root sys" @@ -90,51 +88,44 @@ file path=kernel/drv/$(ARCH64)/usbprn group=sys file path=kernel/drv/$(ARCH64)/wusb_ca group=sys file path=kernel/drv/$(ARCH64)/wusb_df group=sys $(i386_ONLY)file path=kernel/drv/ehci group=sys -file path=kernel/drv/ehci.conf group=sys reboot-needed=false +file path=kernel/drv/ehci.conf group=sys $(i386_ONLY)file path=kernel/drv/hid group=sys $(i386_ONLY)file path=kernel/drv/hubd group=sys $(i386_ONLY)file path=kernel/drv/hwahc group=sys $(i386_ONLY)file path=kernel/drv/hwarc group=sys $(i386_ONLY)file path=kernel/drv/ohci group=sys -file path=kernel/drv/ohci.conf group=sys reboot-needed=false +file path=kernel/drv/ohci.conf group=sys $(i386_ONLY)file path=kernel/drv/scsa2usb group=sys file path=kernel/drv/scsa2usb.conf group=sys \ - original_name=SUNWusb:kernel/drv/scsa2usb.conf preserve=true \ - reboot-needed=false + original_name=SUNWusb:kernel/drv/scsa2usb.conf preserve=true $(i386_ONLY)file path=kernel/drv/uhci group=sys -file path=kernel/drv/uhci.conf group=sys reboot-needed=false +file path=kernel/drv/uhci.conf group=sys $(i386_ONLY)file path=kernel/drv/usb_ac group=sys -file path=kernel/drv/usb_ac.conf group=sys reboot-needed=false +file path=kernel/drv/usb_ac.conf group=sys $(i386_ONLY)file path=kernel/drv/usb_as group=sys $(i386_ONLY)file path=kernel/drv/usb_ia group=sys $(i386_ONLY)file path=kernel/drv/usb_mid group=sys $(i386_ONLY)file path=kernel/drv/usbprn group=sys $(i386_ONLY)file path=kernel/drv/wusb_ca group=sys $(i386_ONLY)file path=kernel/drv/wusb_df group=sys -file path=kernel/misc/$(ARCH64)/hidparser group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/hwa1480_fw group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/usba group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/usba10 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/hidparser group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/hwa1480_fw group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/usba group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/usba10 group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/usb_ah group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/usbkbm group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/usbms group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/usbwcm group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/usb_ah group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/usbkbm group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/usbms group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/usbwcm group=sys mode=0755 \ - reboot-needed=true -file path=lib/svc/method/svc-wusb mode=0555 +file path=kernel/misc/$(ARCH64)/hidparser group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/hwa1480_fw group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/usba group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/usba10 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/hidparser group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/hwa1480_fw group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/usba group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/usba10 group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/usb_ah group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/usbkbm group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/usbms group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/usbwcm group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/usb_ah group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/usbkbm group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/usbms group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/usbwcm group=sys mode=0755 file path=lib/svc/manifest/system/wusb.xml group=sys mode=0444 +file path=lib/svc/method/svc-wusb mode=0555 legacy pkg=SUNWusb arch=$(ARCH) category=system \ desc="USBA (USB framework) and USB Device Drivers" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-x11-winlock.mf b/usr/src/pkg/manifests/driver-x11-winlock.mf index 662678e4dc..e052c82ec6 100644 --- a/usr/src/pkg/manifests/driver-x11-winlock.mf +++ b/usr/src/pkg/manifests/driver-x11-winlock.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/driver/x11/winlock@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="kernel device drivers for X Windows System" set name=pkg.summary value="X Windows System Window Drivers" set name=info.classification value=org.opensolaris.category.2008:System/X11 set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/kernel group=sys dir path=usr/kernel/drv group=sys diff --git a/usr/src/pkg/manifests/driver-x11-xsvc.mf b/usr/src/pkg/manifests/driver-x11-xsvc.mf index 5818d77fcb..e4ede6c3dd 100644 --- a/usr/src/pkg/manifests/driver-x11-xsvc.mf +++ b/usr/src/pkg/manifests/driver-x11-xsvc.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/x11/xsvc@$(PKGVERS) set name=pkg.description value="Sun Xserver pseudo driver" set name=pkg.summary value="Sun Xserver pseudo driver" set name=info.classification value=org.opensolaris.category.2008:System/X11 set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/i86pc group=sys dir path=platform/i86pc/kernel group=sys @@ -48,10 +46,10 @@ dir path=platform/i86xpv/kernel/drv/$(ARCH64) group=sys driver name=xsvc devlink=type=ddi_pseudo;name=xsvc\t\M0 file path=platform/i86pc/kernel/drv/$(ARCH64)/xsvc group=sys file path=platform/i86pc/kernel/drv/xsvc group=sys -file path=platform/i86pc/kernel/drv/xsvc.conf group=sys reboot-needed=false +file path=platform/i86pc/kernel/drv/xsvc.conf group=sys file path=platform/i86xpv/kernel/drv/$(ARCH64)/xsvc group=sys file path=platform/i86xpv/kernel/drv/xsvc group=sys -file path=platform/i86xpv/kernel/drv/xsvc.conf group=sys reboot-needed=false +file path=platform/i86xpv/kernel/drv/xsvc.conf group=sys legacy pkg=SUNWxsvc arch=$(ARCH) category=system \ desc="Sun Xserver pseudo driver" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/driver-xvm-pv.mf b/usr/src/pkg/manifests/driver-xvm-pv.mf index 69593e7b1c..f1cc313231 100644 --- a/usr/src/pkg/manifests/driver-xvm-pv.mf +++ b/usr/src/pkg/manifests/driver-xvm-pv.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/driver/xvm/pv@$(PKGVERS) set name=pkg.description value="xVM Paravirtualized Drivers" set name=pkg.summary value="xVM Paravirtualized Drivers" set name=info.classification \ value=org.opensolaris.category.2008:System/Virtualization set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/$(ARCH32)hvm group=sys dir path=platform/$(ARCH32)hvm/kernel group=sys @@ -58,23 +56,18 @@ file path=platform/$(ARCH32)hvm/kernel/drv/sd group=sys file path=platform/$(ARCH32)hvm/kernel/drv/xdf group=sys file path=platform/$(ARCH32)hvm/kernel/drv/xnf group=sys file path=platform/$(ARCH32)hvm/kernel/drv/xpv group=sys -file path=platform/$(ARCH32)hvm/kernel/drv/xpv.conf group=sys \ - reboot-needed=false +file path=platform/$(ARCH32)hvm/kernel/drv/xpv.conf group=sys file path=platform/$(ARCH32)hvm/kernel/drv/xpvd group=sys -file path=platform/$(ARCH32)hvm/kernel/drv/xpvd.conf group=sys \ - reboot-needed=false +file path=platform/$(ARCH32)hvm/kernel/drv/xpvd.conf group=sys file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_bootstrap group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_cmdk group=sys \ - mode=0755 reboot-needed=true -file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_sd group=sys mode=0755 \ - reboot-needed=true -file path=platform/$(ARCH32)hvm/kernel/misc/hvm_bootstrap group=sys mode=0755 \ - reboot-needed=true -file path=platform/$(ARCH32)hvm/kernel/misc/hvm_cmdk group=sys mode=0755 \ - reboot-needed=true -file path=platform/$(ARCH32)hvm/kernel/misc/hvm_sd group=sys mode=0755 \ - reboot-needed=true + mode=0755 +file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_sd group=sys \ + mode=0755 +file path=platform/$(ARCH32)hvm/kernel/misc/hvm_bootstrap group=sys mode=0755 +file path=platform/$(ARCH32)hvm/kernel/misc/hvm_cmdk group=sys mode=0755 +file path=platform/$(ARCH32)hvm/kernel/misc/hvm_sd group=sys mode=0755 legacy pkg=SUNWxvmpv arch=$(ARCH) category=system \ desc="xVM Paravirtualized Drivers" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/library-demo-audio-samples.mf b/usr/src/pkg/manifests/library-demo-audio-samples.mf index 1d3f1fac71..94c9409b65 100644 --- a/usr/src/pkg/manifests/library-demo-audio-samples.mf +++ b/usr/src/pkg/manifests/library-demo-audio-samples.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/library/demo/audio-samples@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="SunOS audio sound files" set name=pkg.summary value="Audio Sound Files" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/demo dir path=usr/demo/SOUND @@ -73,7 +71,8 @@ file path=usr/share/audio/samples/au/touchtone.pound.au file path=usr/share/audio/samples/au/touchtone.star.au file path=usr/share/audio/samples/au/train.au file path=usr/share/audio/samples/au/whistle.au -legacy pkg=SUNWaudf arch=$(ARCH) category=system desc="SunOS audio sound files" \ +legacy pkg=SUNWaudf arch=$(ARCH) category=system \ + desc="SunOS audio sound files" \ hotline="Please contact your local service provider" \ name="Audio Sound Files" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/library-libadt_jni.mf b/usr/src/pkg/manifests/library-libadt_jni.mf index fd22256d82..39a1102ab9 100644 --- a/usr/src/pkg/manifests/library-libadt_jni.mf +++ b/usr/src/pkg/manifests/library-libadt_jni.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/library/libadt_jni@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="AuditService Implementation" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/library-libtecla.mf b/usr/src/pkg/manifests/library-libtecla.mf index 4dc2d07a98..7b51c396cd 100644 --- a/usr/src/pkg/manifests/library-libtecla.mf +++ b/usr/src/pkg/manifests/library-libtecla.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -31,7 +30,6 @@ set name=pkg.summary value="Tecla command-line editing library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/include diff --git a/usr/src/pkg/manifests/library-print-open-printing-ipp.mf b/usr/src/pkg/manifests/library-print-open-printing-ipp.mf index 2d375df35c..e525b33d3a 100644 --- a/usr/src/pkg/manifests/library-print-open-printing-ipp.mf +++ b/usr/src/pkg/manifests/library-print-open-printing-ipp.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/library/print/open-printing/ipp@$(PKGVERS) set name=pkg.description \ value="Client side support for communicating with IPP based print servers" set name=pkg.summary value="FSG Open Printing API IPP Print Service Module" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/print group=lp diff --git a/usr/src/pkg/manifests/library-print-open-printing-lpd.mf b/usr/src/pkg/manifests/library-print-open-printing-lpd.mf index cbccd52b78..ce690655c9 100644 --- a/usr/src/pkg/manifests/library-print-open-printing-lpd.mf +++ b/usr/src/pkg/manifests/library-print-open-printing-lpd.mf @@ -20,17 +20,17 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/library/print/open-printing/lpd@$(PKGVERS) set name=pkg.description \ value="Client side support for communicating with RFC-1179 based print servers" -set name=pkg.summary value="FSG Open Printing API RFC-1179 Print Service Module" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=pkg.summary \ + value="FSG Open Printing API RFC-1179 Print Service Module" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/print group=lp diff --git a/usr/src/pkg/manifests/library-print-open-printing.mf b/usr/src/pkg/manifests/library-print-open-printing.mf index 0bb5d8b559..fd401fb8ca 100644 --- a/usr/src/pkg/manifests/library-print-open-printing.mf +++ b/usr/src/pkg/manifests/library-print-open-printing.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/library/print/open-printing@$(PKGVERS) set name=pkg.description \ value="Free Standards Group Open Printing API, Draft v0.9" set name=pkg.summary value="Free Standards Group Open Printing API" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf index 5f85faf5a3..60cde6c8fc 100644 --- a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf +++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -32,7 +31,6 @@ set name=pkg.summary \ value="tcpd - access control facility for internet services" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sbin dir path=usr/share group=sys diff --git a/usr/src/pkg/manifests/media-cdrw.mf b/usr/src/pkg/manifests/media-cdrw.mf index 8cfcc09b64..e520d6729b 100644 --- a/usr/src/pkg/manifests/media-cdrw.mf +++ b/usr/src/pkg/manifests/media-cdrw.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/media/cdrw@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary \ value="utility for writing to CD-R/RW and DVD{+-}R/RW disks" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/naming-ldap.mf b/usr/src/pkg/manifests/naming-ldap.mf index 88d9942de0..bafebffa28 100644 --- a/usr/src/pkg/manifests/naming-ldap.mf +++ b/usr/src/pkg/manifests/naming-ldap.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/naming/ldap@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="LDAP Libraries" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin file path=usr/bin/ldapdelete mode=0555 @@ -41,7 +39,8 @@ file path=usr/bin/ldapsearch mode=0555 hardlink path=usr/bin/ldapadd target=./ldapmodify legacy pkg=SUNWlldap arch=$(ARCH) category=system \ desc="Ldap libraries in for software development of dynamically linked executables" \ - hotline="Please contact your local service provider" name="LDAP Libraries" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="LDAP Libraries" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cmd/ldap/THIRDPARTYLICENSE license=cmd/ldap/THIRDPARTYLICENSE license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/network-bridging.mf b/usr/src/pkg/manifests/network-bridging.mf index a60480d5b9..21bf488dbd 100644 --- a/usr/src/pkg/manifests/network-bridging.mf +++ b/usr/src/pkg/manifests/network-bridging.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/bridging@$(PKGVERS) @@ -29,19 +28,18 @@ set name=pkg.description value="Datalink layer bridging support" set name=pkg.summary value="IEEE 802 Bridging Support" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/rcm dir path=usr/lib/rcm/modules -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys +file path=lib/svc/manifest/network/bridge.xml group=sys mode=0444 file path=usr/lib/bridged mode=0555 file path=usr/lib/librstp.so.1 file path=usr/lib/rcm/modules/SUNW_bridge_rcm.so mode=0555 -file path=lib/svc/manifest/network/bridge.xml group=sys mode=0444 legacy pkg=SUNWbridger arch=$(ARCH) category=system \ desc="Datalink layer bridging support" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf b/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf index df0fb7a1cf..18683a6666 100644 --- a/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf +++ b/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/dhcp/dhcpmgr@$(PKGVERS) set name=pkg.description \ value="Graphical management interface for the DHCP server" set name=pkg.summary value="DHCP Manager" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sadm dir path=usr/sadm/admin diff --git a/usr/src/pkg/manifests/network-ftp.mf b/usr/src/pkg/manifests/network-ftp.mf index 0e6b3a1292..557afb5de2 100644 --- a/usr/src/pkg/manifests/network-ftp.mf +++ b/usr/src/pkg/manifests/network-ftp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/ftp@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Basic IP commands" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys dir path=usr group=sys @@ -45,7 +43,8 @@ legacy pkg=SUNWbip arch=$(ARCH) category=system \ hotline="Please contact your local service provider" \ name="Basic IP commands (Usr)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 -legacy pkg=SUNWbipr arch=$(ARCH) category=system desc="Basic IP commands (Root)" \ +legacy pkg=SUNWbipr arch=$(ARCH) category=system \ + desc="Basic IP commands (Root)" \ hotline="Please contact your local service provider" \ name="Basic IP commands (Root)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf index 6240f45a83..e46f632335 100644 --- a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf +++ b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/network/ipfilter/header-ipfilter@$(PKGVERS) set name=pkg.description value="C header files for IP Filter" set name=pkg.summary value="IP Filter header files" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/netinet diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf index 0414703bf5..57ba59aeed 100644 --- a/usr/src/pkg/manifests/network-ipfilter.mf +++ b/usr/src/pkg/manifests/network-ipfilter.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/ipfilter@$(PKGVERS) @@ -30,11 +29,12 @@ set name=pkg.summary value="IP Filter utilities" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/ipf group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/kernel group=sys @@ -53,12 +53,11 @@ dir path=usr/share/ipfilter/examples dir path=var group=sys dir path=var/db group=sys dir path=var/db/ipf group=sys -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys driver name=ipf perms="* 0666 root sys" \ policy="read_priv_set=sys_ip_config write_priv_set=sys_ip_config" file path=etc/ipf/ipf.conf group=sys original_name=SUNWipf:etc/ipf/ipf.conf \ preserve=true +file path=lib/svc/manifest/network/ipfilter.xml group=sys mode=0444 file path=lib/svc/method/ipfilter mode=0555 file path=usr/kernel/drv/$(ARCH64)/ipf group=sys $(i386_ONLY)file path=usr/kernel/drv/ipf group=sys @@ -106,7 +105,6 @@ file path=usr/share/ipfilter/examples/nat.eg file path=usr/share/ipfilter/examples/pool.conf file path=usr/share/ipfilter/examples/server file path=usr/share/ipfilter/examples/tcpstate -file path=lib/svc/manifest/network/ipfilter.xml group=sys mode=0444 hardlink path=usr/lib/ipf/ipftest target=../../../usr/lib/isaexec hardlink path=usr/sbin/ipf target=../../usr/lib/isaexec hardlink path=usr/sbin/ipfs target=../../usr/lib/isaexec diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.mf b/usr/src/pkg/manifests/network-iscsi-initiator.mf index 8f896844bf..0b5ba9cdf6 100644 --- a/usr/src/pkg/manifests/network-iscsi-initiator.mf +++ b/usr/src/pkg/manifests/network-iscsi-initiator.mf @@ -26,46 +26,35 @@ set name=pkg.fmri value=pkg:/network/iscsi/initiator@$(PKGVERS) set name=pkg.description value="Sun iSCSI Management Utilities" set name=pkg.summary value="Sun iSCSI Management Utilities" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/iscsi group=sys opensolaris.zone=global \ +dir path=etc group=sys variant.opensolaris.zone=global +dir path=etc/iscsi group=sys variant.opensolaris.zone=global +dir path=etc/security group=sys variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/network/iscsi group=sys \ variant.opensolaris.zone=global -dir path=etc/security group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network/iscsi group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=iscsi class=scsi-self-identify perms="* 0600 root sys" -file path=kernel/drv/$(ARCH64)/iscsi group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/iscsi group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/iscsi.conf group=sys opensolaris.zone=global \ - original_name=SUNWiscsi:kernel/drv/iscsi.conf preserve=true \ - reboot-needed=false variant.opensolaris.zone=global -file path=lib/svc/method/iscsi-initiator mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/iscsid mode=0555 opensolaris.zone=global \ +file path=kernel/drv/$(ARCH64)/iscsi group=sys +$(i386_ONLY)file path=kernel/drv/iscsi group=sys +file path=kernel/drv/iscsi.conf group=sys \ + original_name=SUNWiscsi:kernel/drv/iscsi.conf preserve=true +file path=lib/svc/manifest/network/iscsi/iscsi-initiator.xml group=sys \ + mode=0444 variant.opensolaris.zone=global +file path=lib/svc/method/iscsi-initiator mode=0555 \ variant.opensolaris.zone=global +file path=lib/svc/method/iscsid mode=0555 variant.opensolaris.zone=global file path=usr/sbin/iscsiadm mode=0555 -file path=lib/svc/manifest/network/iscsi/iscsi-initiator.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWiscsir arch=$(ARCH) category=system \ desc="Sun iSCSI Device Driver" \ hotline="Please contact your local service provider" \ @@ -74,7 +63,7 @@ legacy pkg=SUNWiscsir arch=$(ARCH) category=system \ legacy pkg=SUNWiscsiu arch=$(ARCH) category=system \ desc="Sun iSCSI Management Utilities" \ hotline="Please contact your local service provider" \ - name="Sun iSCSI Management Utilities (usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun iSCSI Management Utilities (usr)" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/network-iscsi-iser.mf b/usr/src/pkg/manifests/network-iscsi-iser.mf index 12bfba1c89..2ad07f40df 100644 --- a/usr/src/pkg/manifests/network-iscsi-iser.mf +++ b/usr/src/pkg/manifests/network-iscsi-iser.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/network/iscsi/iser@$(PKGVERS) set name=pkg.description value="Sun iSCSI Data Mover" set name=pkg.summary value="Sun iSCSI Data Mover" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -51,11 +50,11 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys driver name=iser perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/iser group=sys $(i386_ONLY)file path=kernel/drv/iser group=sys -file path=kernel/drv/iser.conf group=sys reboot-needed=false -file path=kernel/kmdb/$(ARCH64)/idm group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/idm group=sys mode=0555 reboot-needed=true -file path=kernel/misc/$(ARCH64)/idm group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/idm group=sys mode=0755 reboot-needed=true +file path=kernel/drv/iser.conf group=sys +file path=kernel/kmdb/$(ARCH64)/idm group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/idm group=sys mode=0555 +file path=kernel/misc/$(ARCH64)/idm group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/idm group=sys mode=0755 file path=usr/lib/mdb/kvm/$(ARCH64)/idm.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/idm.so group=sys mode=0555 legacy pkg=SUNWiscsidmr arch=$(ARCH) category=system \ diff --git a/usr/src/pkg/manifests/network-iscsi-target-legacy.mf b/usr/src/pkg/manifests/network-iscsi-target-legacy.mf index 9daa8f4ac5..6976ce0a5c 100644 --- a/usr/src/pkg/manifests/network-iscsi-target-legacy.mf +++ b/usr/src/pkg/manifests/network-iscsi-target-legacy.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -32,4 +31,3 @@ set name=pkg.fmri value=pkg:/network/iscsi/target/legacy@0.5.11,5.11-0.136 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.mf index 309d64236e..18608ec3e0 100644 --- a/usr/src/pkg/manifests/network-iscsi-target.mf +++ b/usr/src/pkg/manifests/network-iscsi-target.mf @@ -20,25 +20,25 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/iscsi/target@$(PKGVERS) set name=pkg.description value="Sun iSCSI COMSTAR Port Provider" set name=pkg.summary value="Sun iSCSI COMSTAR Port Provider" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/network/iscsi group=sys \ variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/include dir path=usr/include/sys @@ -46,20 +46,13 @@ dir path=usr/include/sys/iscsit dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network/iscsi group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=iscsit perms="* 0600 root sys" -file path=kernel/drv/$(ARCH64)/iscsit group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/iscsit group=sys opensolaris.zone=global \ +file path=kernel/drv/$(ARCH64)/iscsit group=sys +$(i386_ONLY)file path=kernel/drv/iscsit group=sys +file path=kernel/drv/iscsit.conf group=sys +file path=lib/svc/manifest/network/iscsi/iscsi-target.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=kernel/drv/iscsit.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -file path=lib/svc/method/iscsi-target mode=0555 opensolaris.zone=global \ +file path=lib/svc/method/iscsi-target mode=0555 \ variant.opensolaris.zone=global file path=usr/include/libiscsit.h file path=usr/include/sys/iscsit/iscsit_common.h @@ -69,8 +62,6 @@ file path=usr/lib/libiscsit.so.1 file path=usr/lib/llib-liscsit file path=usr/lib/llib-liscsit.ln file path=usr/sbin/itadm mode=0555 -file path=lib/svc/manifest/network/iscsi/iscsi-target.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWiscsitr arch=$(ARCH) category=system \ desc="Sun iSCSI COMSTAR Port Provider" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/network-iscsi.mf b/usr/src/pkg/manifests/network-iscsi.mf index 6cbed03055..aaff04857a 100644 --- a/usr/src/pkg/manifests/network-iscsi.mf +++ b/usr/src/pkg/manifests/network-iscsi.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/iscsi@0.5.11,5.11-0.134 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/storage/stmf@0.5.11,5.11-0.134 type=require diff --git a/usr/src/pkg/manifests/network-netcat.mf b/usr/src/pkg/manifests/network-netcat.mf index ed6e8bce0e..01d5a78e3f 100644 --- a/usr/src/pkg/manifests/network-netcat.mf +++ b/usr/src/pkg/manifests/network-netcat.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/netcat@$(PKGVERS) @@ -30,12 +29,12 @@ set name=pkg.summary value="Netcat Command" set name=info.classification \ value=org.opensolaris.category.2008:Applications/Internet set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin file path=usr/bin/nc mode=0555 legacy pkg=SUNWnetcat arch=$(ARCH) category=system desc="Netcat Command" \ - hotline="Please contact your local service provider" name="Netcat Command" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="Netcat Command" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE \ license=cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/network-ssh-ssh-key.mf b/usr/src/pkg/manifests/network-ssh-ssh-key.mf index 6b509863ad..cbc87b5cde 100644 --- a/usr/src/pkg/manifests/network-ssh-ssh-key.mf +++ b/usr/src/pkg/manifests/network-ssh-ssh-key.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/ssh/ssh-key@$(PKGVERS) set name=pkg.description value="Secure Shell protocol common Utilities" set name=pkg.summary value="SSH Common" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/network-ssh.mf b/usr/src/pkg/manifests/network-ssh.mf index 0a89d281f1..950176cd34 100644 --- a/usr/src/pkg/manifests/network-ssh.mf +++ b/usr/src/pkg/manifests/network-ssh.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/ssh@$(PKGVERS) set name=pkg.description \ value="Secure Shell protocol Client and associated Utilities" set name=pkg.summary value="SSH Client and utilities" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/ssh group=sys dir path=usr group=sys @@ -38,8 +37,8 @@ dir path=usr/bin dir path=usr/lib dir path=usr/lib/ssh file path=etc/ssh/moduli group=sys -file path=etc/ssh/ssh_config group=sys original_name=SUNWssh:etc/ssh/ssh_config \ - preserve=true +file path=etc/ssh/ssh_config group=sys \ + original_name=SUNWssh:etc/ssh/ssh_config preserve=true file path=usr/bin/scp mode=0555 file path=usr/bin/sftp mode=0555 file path=usr/bin/ssh mode=0555 diff --git a/usr/src/pkg/manifests/network-telnet.mf b/usr/src/pkg/manifests/network-telnet.mf index 3e9f20d814..3de9029d8d 100644 --- a/usr/src/pkg/manifests/network-telnet.mf +++ b/usr/src/pkg/manifests/network-telnet.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/network/telnet@$(PKGVERS) @@ -30,11 +29,11 @@ set name=pkg.summary value="Telnet Command (client)" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin file path=usr/bin/telnet mode=0555 -legacy pkg=SUNWtnetc arch=$(ARCH) category=system desc="Telnet Command (client)" \ +legacy pkg=SUNWtnetc arch=$(ARCH) category=system \ + desc="Telnet Command (client)" \ hotline="Please contact your local service provider" \ name="Telnet Command (client)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/package-svr4.mf b/usr/src/pkg/manifests/package-svr4.mf index 4aaa034ac1..8d02a69bec 100644 --- a/usr/src/pkg/manifests/package-svr4.mf +++ b/usr/src/pkg/manifests/package-svr4.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/package/svr4@$(PKGVERS) @@ -30,9 +29,10 @@ set name=pkg.summary value="SVr4 packaging commands" set name=info.classification \ value=org.opensolaris.category.2008:System/Packaging set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib -dir path=lib/svc +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -50,8 +50,7 @@ dir path=var/sadm/pkg group=sys mode=0555 dir path=var/sadm/security group=sys mode=0555 dir path=var/spool dir path=var/spool/pkg mode=1777 -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys +file path=lib/svc/manifest/system/pkgserv.xml group=sys mode=0444 file path=usr/bin/pkgadm mode=0555 file path=usr/bin/pkgcond group=sys mode=0555 file path=usr/bin/pkginfo group=sys mode=0555 @@ -79,7 +78,6 @@ file path=usr/sbin/pkgadd group=sys mode=0555 file path=usr/sbin/pkgchk group=sys mode=0555 file path=usr/sbin/pkgrm group=sys mode=0555 file path=var/sadm/install/admin/default group=sys mode=0444 -file path=lib/svc/manifest/system/pkgserv.xml group=sys mode=0444 hardlink path=usr/sadm/install/scripts/i.CONFIG.prsv target=./i.preserve hardlink path=usr/sbin/pkgask target=../../usr/sbin/pkgadd hardlink path=usr/sbin/removef target=../../usr/sbin/installf diff --git a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf index 00111e9664..d8785edba9 100644 --- a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf +++ b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/print/lp/compatibility/sunos4@$(PKGVERS) set name=pkg.description \ value="print utilities for user interface and source build compatibility with SunOS 4.x" set name=pkg.summary value="Solaris Print - Source Compatibility" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/ucb legacy pkg=SUNWscplp arch=$(ARCH) category=system \ diff --git a/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.mf b/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.mf index a0ff29a551..79d4db8659 100644 --- a/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.mf +++ b/usr/src/pkg/manifests/print-lp-filter-postscript-lp-filter.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/print/lp/filter/postscript-lp-filter@$(PKGVERS) set name=pkg.description \ value="client configuration files and utilities for the print service" set name=pkg.summary value="PostScript filters -" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/lp group=lp diff --git a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf index f23eb2c8d3..f08e1e9941 100644 --- a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf +++ b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf @@ -20,36 +20,35 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/print/lp/ipp/ipp-listener@$(PKGVERS) set name=pkg.description \ value="Internet Printing Protocol(IPP) Apache module for listening service" set name=pkg.summary value="Internet Printing Protocol(IPP) listener module" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/apache dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/print group=sys dir path=usr group=sys dir path=usr/apache dir path=usr/apache/libexec dir path=var group=sys dir path=var/lp group=lp mode=0775 owner=lp dir path=var/lp/ipp-listener -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/application group=sys -dir path=lib/svc/manifest/application/print group=sys file path=etc/apache/httpd-standalone-ipp.conf \ original_name=SUNWippl:etc/apache/httpd-standalone-ipp.conf preserve=true -file path=usr/apache/libexec/mod_ipp.so mode=0555 -file path=var/lp/ipp-listener/index.html mode=0444 file path=lib/svc/manifest/application/print/ipp-listener.xml group=sys \ mode=0444 +file path=usr/apache/libexec/mod_ipp.so mode=0555 +file path=var/lp/ipp-listener/index.html mode=0444 legacy pkg=SUNWipplr arch=$(ARCH) category=system \ desc="Internet Printing Protocol(IPP) Apache configuration for service module" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/print-lp-ipp-libipp.mf b/usr/src/pkg/manifests/print-lp-ipp-libipp.mf index c664648877..ca3f73b58a 100644 --- a/usr/src/pkg/manifests/print-lp-ipp-libipp.mf +++ b/usr/src/pkg/manifests/print-lp-ipp-libipp.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/print/lp/ipp/libipp@$(PKGVERS) set name=pkg.description \ value="Internet Print Protocol (IPP) encoding/decoding/operation support" set name=pkg.summary value="Internet Printing Protocol(IPP) core libraries" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib file path=usr/lib/libipp-core.so.0 diff --git a/usr/src/pkg/manifests/print-lp-print-client-commands.mf b/usr/src/pkg/manifests/print-lp-print-client-commands.mf index 948d3f03dd..8d3d12bfee 100644 --- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf +++ b/usr/src/pkg/manifests/print-lp-print-client-commands.mf @@ -27,9 +27,9 @@ set name=pkg.fmri value=pkg:/print/lp/print-client-commands@$(PKGVERS) set name=pkg.description \ value="client configuration files and utilities for the print service" set name=pkg.summary value="Solaris Print - Client" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf b/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf index c8a5316ec8..1cb8f5e097 100644 --- a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf +++ b/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf @@ -20,19 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/print/lp/print-manager/legacy@$(PKGVERS) set name=pkg.description \ value="Graphical tool for managing printers under Solaris." set name=pkg.summary value="Solaris Print Manager" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/print group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib @@ -49,9 +51,8 @@ dir path=var group=sys dir path=var/lp group=lp mode=0775 owner=lp dir path=var/lp/ppd group=lp dir path=var/lp/ppd/caches group=lp -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/application group=sys -dir path=lib/svc/manifest/application/print group=sys +file path=lib/svc/manifest/application/print/ppd-cache-update.xml group=sys \ + mode=0444 file path=lib/svc/method/ppd-cache-update mode=0555 file path=usr/lib/lp/bin/getmakes group=lp mode=0555 file path=usr/lib/lp/bin/getmodels group=lp mode=0555 @@ -65,8 +66,6 @@ file path=usr/sadm/admin/printmgr/classes/pmserver.jar group=lp file path=usr/sadm/admin/printmgr/lib/libpmgr.so.1 group=lp file path=usr/sbin/ppdmgr group=lp mode=0555 file path=var/lp/ppd/manufaliases group=lp mode=0444 -file path=lib/svc/manifest/application/print/ppd-cache-update.xml group=sys \ - mode=0444 legacy pkg=SUNWppm arch=$(ARCH) category=system \ desc="Graphical tool for managing printers under Solaris." \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/print-lp.mf b/usr/src/pkg/manifests/print-lp.mf index bffbbd7d7c..ad8312cba4 100644 --- a/usr/src/pkg/manifests/print-lp.mf +++ b/usr/src/pkg/manifests/print-lp.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/print/lp@$(PKGVERS) set name=pkg.description \ value="client configuration files and utilities for the print service" set name=pkg.summary value="Solaris Print - LP Server" -set name=info.classification value=org.opensolaris.category.2008:System/Printing +set name=info.classification \ + value=org.opensolaris.category.2008:System/Printing set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/lp group=lp mode=0775 owner=lp dir path=etc/lp/classes group=lp mode=0775 owner=lp @@ -42,6 +41,9 @@ dir path=etc/lp/printers group=lp mode=0775 owner=lp dir path=etc/lp/pwheels group=lp mode=0775 owner=lp dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/print group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -71,9 +73,6 @@ dir path=var/spool/lp/admins group=lp mode=0775 owner=lp dir path=var/spool/lp/requests group=lp mode=0775 owner=lp dir path=var/spool/lp/system group=lp mode=0775 owner=lp dir path=var/spool/print group=lp -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/application group=sys -dir path=lib/svc/manifest/application/print group=sys file path=etc/lp/fd/catv.fd group=lp file path=etc/lp/fd/download.fd group=lp file path=etc/lp/fd/dpost.fd group=lp @@ -90,6 +89,8 @@ file path=etc/lp/fd/posttek.fd group=lp file path=etc/lp/fd/pr.fd group=lp file path=etc/printers.conf group=sys original_name=SUNWpc:etc/printers.conf \ preserve=true +file path=lib/svc/manifest/application/print/rfc1179.xml group=sys mode=0444 +file path=lib/svc/manifest/application/print/server.xml group=sys mode=0444 file path=lib/svc/method/print-svc mode=0555 file path=usr/bin/lpget group=lp mode=0511 file path=usr/bin/lpset group=lp mode=4511 @@ -216,8 +217,6 @@ file path=usr/share/lib/terminfo/a/att477+basic2 file path=usr/share/lib/terminfo/a/att583+basic file path=var/spool/cron/crontabs/lp group=root mode=0400 \ original_name=SUNWps:var/spool/cron/crontabs/lp preserve=true -file path=lib/svc/manifest/application/print/rfc1179.xml group=sys mode=0444 -file path=lib/svc/manifest/application/print/server.xml group=sys mode=0444 hardlink path=usr/share/lib/terminfo/4/458 \ target=../../../../../usr/share/lib/terminfo/4/457 hardlink path=usr/share/lib/terminfo/4/477qume \ diff --git a/usr/src/pkg/manifests/runtime-perl-584-extra.mf b/usr/src/pkg/manifests/runtime-perl-584-extra.mf index 5b56d76b13..0d4fa142ba 100644 --- a/usr/src/pkg/manifests/runtime-perl-584-extra.mf +++ b/usr/src/pkg/manifests/runtime-perl-584-extra.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -31,7 +30,6 @@ set name=pkg.summary value="Perl 5.8.4 (non-core)" set name=info.classification \ value=org.opensolaris.category.2008:Development/Perl set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/perl5 @@ -92,14 +90,18 @@ $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Devel/Peek $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Byte $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/CN -$(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/EBCDIC +$(i386_ONLY)dir \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/EBCDIC $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/JP $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/KR -$(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Symbol +$(i386_ONLY)dir \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Symbol $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/TW -$(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Unicode +$(i386_ONLY)dir \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Unicode $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/I18N -$(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/I18N/Langinfo +$(i386_ONLY)dir \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/I18N/Langinfo $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Opcode $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Unicode $(i386_ONLY)dir \ @@ -126,14 +128,18 @@ $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Devel/Peek $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Byte $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN -$(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC +$(sparc_ONLY)dir \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR -$(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol +$(sparc_ONLY)dir \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW -$(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Unicode +$(sparc_ONLY)dir \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Unicode $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N -$(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo +$(sparc_ONLY)dir \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Unicode $(sparc_ONLY)dir \ @@ -173,7 +179,8 @@ file path=usr/perl5/5.8.4/bin/s2p mode=0555 file path=usr/perl5/5.8.4/bin/splain mode=0555 file path=usr/perl5/5.8.4/bin/xsubpp mode=0555 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/Demo.pm mode=0444 -file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/Descriptions.pm mode=0444 +file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/Descriptions.pm \ + mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/MyClass.pm mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo.pl mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo2.pl mode=0444 @@ -182,10 +189,12 @@ file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo4.pl mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_call.pl mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_chain.pl mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_cycle.pl mode=0444 -file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_hashdir.pl mode=0444 +file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_hashdir.pl \ + mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_phases.pl mode=0444 file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_range.pl mode=0444 -file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_rawdata.pl mode=0444 +file path=usr/perl5/5.8.4/lib/Attribute/Handlers/demo/demo_rawdata.pl \ + mode=0444 file path=usr/perl5/5.8.4/lib/B/assemble mode=0444 file path=usr/perl5/5.8.4/lib/B/cc_harness mode=0444 file path=usr/perl5/5.8.4/lib/B/disassemble mode=0444 @@ -400,15 +409,16 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Bblock.pm \ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Bytecode.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/C.pm mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/CC.pm mode=0444 +$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/CC.pm \ + mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Concise.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Debug.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Deparse.pm \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Disassembler.pm \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Disassembler.pm mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Lint.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/B/Showlex.pm \ @@ -431,8 +441,8 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/XSUB.h \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/av.h \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/cc_runtime.h \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/cc_runtime.h mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/config.h \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/cop.h \ @@ -463,8 +473,8 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/iperlsys.h \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/keywords.h \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/malloc_ctl.h \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/malloc_ctl.h mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/mg.h \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/nostdio.h \ @@ -477,8 +487,8 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/opnames.h \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/pad.h \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/patchlevel.h \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/patchlevel.h mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/perl.h \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/perlapi.h \ @@ -554,10 +564,10 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Config.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/EBCDIC.pm \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Encoder.pm \ - mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Encoding.pm \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Encoder.pm mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Encoding.pm mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Guess.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/JP.pm \ @@ -568,16 +578,18 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Symbol.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/TW.pm \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Unicode.pm \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Encode/Unicode.pm mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/O.pm mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Opcode.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/POSIX.pod \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Safe.pm mode=0444 +$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Safe.pm \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Unicode/Normalize.pm mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Unicode/Normalize.pm \ + mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/XS/APItest.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/XS/Typemap.pm \ @@ -621,9 +633,11 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Byte/Byte.so \ mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/CN/CN.bs mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/CN/CN.bs \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/CN/CN.so mode=0555 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/CN/CN.so \ + mode=0555 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/EBCDIC/EBCDIC.bs \ mode=0444 @@ -637,13 +651,17 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Encode.so \ mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/JP/JP.bs mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/JP/JP.bs \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/JP/JP.so mode=0555 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/JP/JP.so \ + mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/KR/KR.bs mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/KR/KR.bs \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/KR/KR.so mode=0555 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/KR/KR.so \ + mode=0555 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Symbol/Symbol.bs \ mode=0444 @@ -651,9 +669,11 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Symbol/Symbol.so \ mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/TW/TW.bs mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/TW/TW.bs \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/TW/TW.so mode=0555 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/TW/TW.so \ + mode=0555 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Encode/Unicode/Unicode.bs \ mode=0444 @@ -818,15 +838,16 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Bblock.pm \ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Bytecode.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/C.pm mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/CC.pm mode=0444 +$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/CC.pm \ + mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Concise.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Debug.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Deparse.pm \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Disassembler.pm \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Disassembler.pm mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Lint.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/B/Showlex.pm \ @@ -849,8 +870,8 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/XSUB.h \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/av.h \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/cc_runtime.h \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/cc_runtime.h mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/config.h \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/cop.h \ @@ -881,8 +902,8 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/iperlsys.h \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/keywords.h \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/malloc_ctl.h \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/malloc_ctl.h mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/mg.h \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/nostdio.h \ @@ -895,8 +916,8 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/opnames.h \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/pad.h \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/patchlevel.h \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/patchlevel.h mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perl.h \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/perlapi.h \ @@ -972,10 +993,10 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Config.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/EBCDIC.pm \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Encoder.pm \ - mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Encoding.pm \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Encoder.pm mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Encoding.pm mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Guess.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/JP.pm \ @@ -986,16 +1007,18 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Symbol.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/TW.pm \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Unicode.pm \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Encode/Unicode.pm mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/O.pm mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Opcode.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/POSIX.pod \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Safe.pm mode=0444 +$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Safe.pm \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Unicode/Normalize.pm mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Unicode/Normalize.pm \ + mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/XS/APItest.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/XS/Typemap.pm \ @@ -1039,9 +1062,11 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Byte/Byte.so \ mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN/CN.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN/CN.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN/CN.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/CN/CN.so \ + mode=0555 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC/EBCDIC.bs \ mode=0444 @@ -1049,17 +1074,23 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/EBCDIC/EBCDIC.so \ mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Encode.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Encode.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Encode.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Encode.so \ + mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP/JP.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP/JP.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP/JP.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/JP/JP.so \ + mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR/KR.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR/KR.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR/KR.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/KR/KR.so \ + mode=0555 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol/Symbol.bs \ mode=0444 @@ -1067,9 +1098,11 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Symbol/Symbol.so \ mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW/TW.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW/TW.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW/TW.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/TW/TW.so \ + mode=0555 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Encode/Unicode/Unicode.bs \ mode=0444 @@ -1086,9 +1119,11 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/I18N/Langinfo/autosplit.ix \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode/Opcode.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode/Opcode.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode/Opcode.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Opcode/Opcode.so \ + mode=0555 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Unicode/Normalize/Normalize.bs \ mode=0444 diff --git a/usr/src/pkg/manifests/runtime-perl-584.mf b/usr/src/pkg/manifests/runtime-perl-584.mf index 3e616a9889..2b7218ba7d 100644 --- a/usr/src/pkg/manifests/runtime-perl-584.mf +++ b/usr/src/pkg/manifests/runtime-perl-584.mf @@ -30,7 +30,6 @@ set name=pkg.summary value="Perl 5.8.4 (core)" set name=info.classification \ value=org.opensolaris.category.2008:Development/Perl set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/perl5 @@ -114,7 +113,8 @@ $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/PerlIO $(i386_ONLY)dir \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/PerlIO/encoding -$(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/PerlIO/scalar +$(i386_ONLY)dir \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/PerlIO/scalar $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/PerlIO/via $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/SDBM_File $(i386_ONLY)dir path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Socket @@ -194,7 +194,8 @@ $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO $(sparc_ONLY)dir \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/encoding -$(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/scalar +$(sparc_ONLY)dir \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/scalar $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/via $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/SDBM_File $(sparc_ONLY)dir path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket @@ -382,8 +383,8 @@ file path=usr/perl5/5.8.4/lib/constant.pm mode=0444 file path=usr/perl5/5.8.4/lib/diagnostics.pm mode=0444 file path=usr/perl5/5.8.4/lib/fields.pm mode=0444 file path=usr/perl5/5.8.4/lib/filetest.pm mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/libperl.so.1 \ - mode=0555 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/libperl.so.1 mode=0555 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Config.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Cwd.pm mode=0444 @@ -393,12 +394,15 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Digest/MD5.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/DynaLoader.pm \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Errno.pm mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Fcntl.pm mode=0444 +$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Errno.pm \ + mode=0444 +$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Fcntl.pm \ + mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/File/Glob.pm \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Filter/Util/Call.pm mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Filter/Util/Call.pm \ + mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/I18N/Langinfo.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/IO.pm mode=0444 @@ -427,14 +431,16 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/IPC/SysV.pm \ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/MIME/Base64.pm \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/MIME/QuotedPrint.pm mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/MIME/QuotedPrint.pm \ + mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/NDBM_File.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/ODBM_File.pm \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/POSIX.pm mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/PerlIO/encoding.pm \ +$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/POSIX.pm \ mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/PerlIO/encoding.pm mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/PerlIO/scalar.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/PerlIO/via.pm \ @@ -453,7 +459,8 @@ $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/Time/HiRes.pm \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/XSLoader.pm \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/attrs.pm mode=0444 +$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/attrs.pm \ + mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Cwd/Cwd.bs \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Cwd/Cwd.so \ @@ -489,9 +496,11 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/DynaLoader/extralibs.ld \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Fcntl/Fcntl.bs mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Fcntl/Fcntl.bs \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Fcntl/Fcntl.so mode=0555 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Fcntl/Fcntl.so \ + mode=0555 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/File/Glob/Glob.bs \ mode=0444 @@ -539,140 +548,178 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/ODBM_File/ODBM_File.so \ mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/POSIX.bs mode=0444 -$(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/POSIX.so mode=0555 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/abs.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/POSIX.bs \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/alarm.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/POSIX.so \ + mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/assert.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/abs.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atan2.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/alarm.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atexit.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atof.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/assert.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atoi.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atan2.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atol.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atexit.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atof.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atoi.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/atol.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/autosplit.ix \ mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/bsearch.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/calloc.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/calloc.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/chdir.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/chdir.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/chmod.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/chmod.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/chown.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/chown.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/clearerr.al \ mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/closedir.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/cos.al \ - mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/creat.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/div.al \ - mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/cos.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/errno.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/creat.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execl.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/div.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execle.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/errno.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execlp.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execl.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execv.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execle.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execve.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execlp.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execvp.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/exit.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execv.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/exp.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execve.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fabs.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/execvp.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fclose.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/exit.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fcntl.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/exp.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fdopen.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/feof.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fabs.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fclose.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ferror.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fcntl.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fflush.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fdopen.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fgetc.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/feof.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ferror.al \ + mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fflush.al \ + mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fgetc.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fgetpos.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fgets.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fgets.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fileno.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fileno.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fopen.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fork.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fopen.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fork.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fprintf.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fputc.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fputc.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fputs.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fputs.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fread.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/free.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fread.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/free.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/freopen.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fscanf.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fscanf.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fseek.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fseek.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fsetpos.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fstat.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fstat.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fsync.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fsync.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ftell.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ftell.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fwrite.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getc.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/fwrite.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getc.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getchar.al \ mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getegid.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getenv.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getenv.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/geteuid.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getgid.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getgid.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getgrgid.al \ mode=0444 @@ -689,7 +736,8 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getpgrp.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getpid.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getpid.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getppid.al \ mode=0444 @@ -699,48 +747,57 @@ $(i386_ONLY)file \ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getpwuid.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/gets.al \ - mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getuid.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/gets.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/gmtime.al mode=0444 -$(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/isatty.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/kill.al \ - mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/labs.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/getuid.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ldiv.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/gmtime.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/link.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/isatty.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/kill.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/labs.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ldiv.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/link.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/load_imports.al \ mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/localtime.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/log.al \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/log.al mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/longjmp.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/malloc.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/malloc.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memchr.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memchr.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memcmp.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memcmp.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memcpy.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memcpy.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memmove.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memset.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/memset.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/mkdir.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/mkdir.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/offsetof.al \ mode=0444 @@ -748,49 +805,61 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/opendir.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/perror.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/pow.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/perror.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/printf.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/putc.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/pow.al mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/printf.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/putc.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/putchar.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/puts.al \ - mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/qsort.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/puts.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/raise.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rand.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/qsort.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/raise.al \ + mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rand.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/readdir.al \ mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/realloc.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/redef.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/redef.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/remove.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/remove.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rename.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rename.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rewind.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rewind.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rewinddir.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rmdir.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/rmdir.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/scanf.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/scanf.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/setbuf.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/setbuf.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/setjmp.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/setjmp.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/setvbuf.al \ mode=0444 @@ -800,29 +869,36 @@ $(i386_ONLY)file \ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sigsetjmp.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sin.al \ - mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sleep.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sin.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sprintf.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sleep.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sqrt.al \ +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sprintf.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/srand.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sqrt.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sscanf.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/stat.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/srand.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcat.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/sscanf.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strchr.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/stat.al mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcmp.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcat.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcpy.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strchr.al \ + mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcmp.al \ + mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcpy.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strcspn.al \ mode=0444 @@ -830,7 +906,8 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strerror.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strlen.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strlen.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strncat.al \ mode=0444 @@ -847,16 +924,20 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strrchr.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strspn.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strspn.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strstr.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strstr.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strtok.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/strtok.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/system.al mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/time.al \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/system.al \ mode=0444 $(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/time.al mode=0444 +$(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/tmpfile.al \ mode=0444 $(i386_ONLY)file \ @@ -866,17 +947,23 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/toupper.al \ mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/umask.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/umask.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ungetc.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/ungetc.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/unimpl.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/unimpl.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/unlink.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/unlink.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/usage.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/usage.al \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/utime.al mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/utime.al \ + mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/vfprintf.al \ mode=0444 @@ -886,8 +973,8 @@ $(i386_ONLY)file \ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/vsprintf.al \ mode=0444 -$(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/wait.al \ - mode=0444 +$(i386_ONLY)file \ + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/wait.al mode=0444 $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/POSIX/waitpid.al \ mode=0444 @@ -1087,9 +1174,11 @@ $(i386_ONLY)file \ path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/Time/HiRes/HiRes.so \ mode=0555 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/attrs/attrs.bs mode=0444 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/attrs/attrs.bs \ + mode=0444 $(i386_ONLY)file \ - path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/attrs/attrs.so mode=0555 + path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/attrs/attrs.so \ + mode=0555 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/re/re.bs \ mode=0444 $(i386_ONLY)file path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/auto/re/re.so \ @@ -1109,8 +1198,8 @@ file path=usr/perl5/5.8.4/lib/sigtrap.pm mode=0444 file path=usr/perl5/5.8.4/lib/sort.pm mode=0444 file path=usr/perl5/5.8.4/lib/strict.pm mode=0444 file path=usr/perl5/5.8.4/lib/subs.pm mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/libperl.so.1 \ - mode=0555 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/CORE/libperl.so.1 mode=0555 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Config.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Cwd.pm mode=0444 @@ -1120,8 +1209,10 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Digest/MD5.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/DynaLoader.pm \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Errno.pm mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Fcntl.pm mode=0444 +$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Errno.pm \ + mode=0444 +$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Fcntl.pm \ + mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/File/Glob.pm \ mode=0444 $(sparc_ONLY)file \ @@ -1159,9 +1250,10 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/NDBM_File.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/ODBM_File.pm \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/POSIX.pm mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/encoding.pm \ +$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/POSIX.pm \ mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/encoding.pm mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/scalar.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/PerlIO/via.pm \ @@ -1180,7 +1272,8 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/Time/HiRes.pm \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/XSLoader.pm \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/attrs.pm mode=0444 +$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/attrs.pm \ + mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Cwd/Cwd.bs \ mode=0444 $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Cwd/Cwd.so \ @@ -1236,9 +1329,11 @@ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IO/IO.bs \ $(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IO/IO.so \ mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/IPC/SysV/SysV.so \ + mode=0555 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/List/Util/Util.bs \ mode=0444 @@ -1267,29 +1362,33 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/POSIX.bs mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/POSIX.so mode=0555 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/abs.al \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/abs.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/alarm.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/assert.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/assert.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atan2.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atexit.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atof.al \ - mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atoi.al \ - mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atol.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atexit.al \ mode=0444 $(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atof.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atoi.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/atol.al mode=0444 +$(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/autosplit.ix \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/bsearch.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/bsearch.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/calloc.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/calloc.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/chdir.al mode=0444 $(sparc_ONLY)file \ @@ -1302,74 +1401,88 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/closedir.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/cos.al \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/cos.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/creat.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/div.al \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/div.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/errno.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execl.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execle.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execle.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execlp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execlp.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execv.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execve.al mode=0444 -$(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execvp.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/exit.al \ - mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/exp.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execve.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fabs.al \ +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/execvp.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fclose.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/exit.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/exp.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fabs.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fclose.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fcntl.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fdopen.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/feof.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fdopen.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ferror.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/feof.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fflush.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ferror.al \ + mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fflush.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgetc.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgetpos.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgetpos.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fgets.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fileno.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fileno.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fopen.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fork.al \ - mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fprintf.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fork.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fprintf.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fputc.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fputs.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fread.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/free.al \ - mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/freopen.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/free.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/freopen.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fscanf.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fscanf.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fseek.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fsetpos.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fsetpos.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fstat.al mode=0444 $(sparc_ONLY)file \ @@ -1377,19 +1490,25 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ftell.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fwrite.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getc.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/fwrite.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getchar.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getc.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getegid.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getchar.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getenv.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getegid.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/geteuid.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getenv.al \ + mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/geteuid.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgid.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgid.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getgrgid.al \ mode=0444 @@ -1403,92 +1522,114 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getlogin.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpgrp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpgrp.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpid.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpid.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getppid.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getppid.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpwnam.al \ mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getpwuid.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/gets.al \ - mode=0444 -$(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getuid.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/gmtime.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/gets.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/isatty.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/kill.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/getuid.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/labs.al \ - mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ldiv.al \ +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/gmtime.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/link.al \ +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/isatty.al \ mode=0444 $(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/kill.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/labs.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ldiv.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/link.al mode=0444 +$(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/load_imports.al \ mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/localtime.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/log.al \ - mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/longjmp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/log.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/malloc.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/longjmp.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memchr.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/malloc.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memcmp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memchr.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memcpy.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memcmp.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memmove.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memcpy.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memset.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memmove.al \ + mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/memset.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/mkdir.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/offsetof.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/opendir.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/opendir.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/perror.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/pow.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/perror.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/printf.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/putc.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/pow.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/printf.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/putchar.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/puts.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/putc.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/putchar.al \ mode=0444 $(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/puts.al mode=0444 +$(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/qsort.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/raise.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rand.al \ - mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/readdir.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rand.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/readdir.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/realloc.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/realloc.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/redef.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/remove.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/remove.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rename.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rename.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rewind.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rewind.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/rewinddir.al \ mode=0444 @@ -1497,80 +1638,106 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/scanf.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setbuf.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setbuf.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setjmp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setjmp.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setvbuf.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/setvbuf.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/siglongjmp.al \ mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sigsetjmp.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sin.al \ - mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sin.al mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sleep.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sprintf.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sqrt.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sprintf.al \ mode=0444 $(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sqrt.al mode=0444 +$(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/srand.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sscanf.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/stat.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/sscanf.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcat.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/stat.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strchr.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcat.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcmp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strchr.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcpy.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcmp.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcspn.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcpy.al \ + mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strcspn.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strerror.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strlen.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strlen.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncat.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncat.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncmp.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncmp.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncpy.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strncpy.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strpbrk.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strpbrk.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strrchr.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strrchr.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strspn.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strspn.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strstr.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strstr.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strtok.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/strtok.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/system.al mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/time.al \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/system.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/tmpfile.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/time.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/tolower.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/tmpfile.al \ + mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/tolower.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/toupper.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/toupper.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/umask.al mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ungetc.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/ungetc.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/unimpl.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/unimpl.al \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/unlink.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/unlink.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/usage.al mode=0444 $(sparc_ONLY)file \ @@ -1579,14 +1746,16 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vfprintf.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vprintf.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vprintf.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/vsprintf.al \ mode=0444 -$(sparc_ONLY)file path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/wait.al \ - mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/waitpid.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/wait.al mode=0444 +$(sparc_ONLY)file \ + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/POSIX/waitpid.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/PerlIO/encoding/encoding.bs \ mode=0444 @@ -1612,9 +1781,11 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/SDBM_File/SDBM_File.so \ mode=0555 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket/Socket.bs mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket/Socket.bs \ + mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket/Socket.so mode=0555 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Socket/Socket.so \ + mode=0555 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/CAN_FLOCK.al \ mode=0444 @@ -1685,7 +1856,8 @@ $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/store_fd.al \ mode=0444 $(sparc_ONLY)file \ - path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/thaw.al mode=0444 + path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Storable/thaw.al \ + mode=0444 $(sparc_ONLY)file \ path=usr/perl5/5.8.4/lib/sun4-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs \ mode=0444 diff --git a/usr/src/pkg/manifests/security-bart.mf b/usr/src/pkg/manifests/security-bart.mf index 71120634ea..75b2e4ca5a 100644 --- a/usr/src/pkg/manifests/security-bart.mf +++ b/usr/src/pkg/manifests/security-bart.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/security/bart@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Basic Audit Reporting Tool" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin file path=usr/bin/bart mode=0555 diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index 3b1d280708..db5917794a 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -20,17 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/service/fault-management@$(PKGVERS) set name=pkg.description value="Fault Management Daemon and Utilities" set name=pkg.summary value="Fault Management Daemon and Utilities" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/fm group=sys dir path=etc/fm/fmd group=sys @@ -97,7 +101,8 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd $(sparc_ONLY)dir \ path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/fmd/plugins $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo -$(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps +$(sparc_ONLY)dir \ + path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/lib/fm/fmd @@ -196,7 +201,7 @@ file path=etc/net-snmp/snmp/fmd-trapgen.conf mode=0600 file path=etc/net-snmp/snmp/mibs/SUN-FM-MIB.mib file path=kernel/drv/$(ARCH64)/fm group=sys $(i386_ONLY)file path=kernel/drv/fm group=sys -file path=kernel/drv/fm.conf group=sys reboot-needed=false +file path=kernel/drv/fm.conf group=sys file path=usr/include/fm/diagcode.h file path=usr/include/fm/fmd_adm.h file path=usr/include/fm/fmd_agent.h @@ -377,11 +382,13 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps/Netra-CP3260-hc-topology.xml \ mode=0444 -$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.conf $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-T5220/lib/fm/topo/maps/Netra-T5220-hc-topology.xml \ mode=0444 -$(sparc_ONLY)file path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Netra-T5440/lib/fm/fmd/plugins/etm.conf $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-T5440/lib/fm/topo/maps/Netra-T5440-hc-topology.xml \ mode=0444 @@ -448,8 +455,8 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/maps/Sun-Fire-hc-topology.xml \ mode=0444 -$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins/ioboard.so \ - mode=0555 +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire/lib/fm/topo/plugins/ioboard.so mode=0555 $(sparc_ONLY)file path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.conf $(sparc_ONLY)file \ path=usr/platform/SUNW,T5140/lib/fm/topo/maps/Sun-Blade-T6340-hc-topology.xml \ @@ -463,7 +470,8 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=usr/platform/SUNW,T5140/lib/fm/topo/maps/T5440-hc-topology.xml \ mode=0444 -$(sparc_ONLY)file path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf +$(sparc_ONLY)file \ + path=usr/platform/SUNW,USBRDT-5240/lib/fm/fmd/plugins/etm.conf $(sparc_ONLY)file \ path=usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps/USBRDT-5240-hc-topology.xml \ mode=0444 @@ -490,13 +498,14 @@ $(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4600-M2-disk-hc-topology.xml \ mode=0444 $(i386_ONLY)file \ - path=usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml mode=0444 + path=usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml \ + mode=0444 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml \ mode=0444 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/fan-hc-topology.xml \ mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml \ - mode=0444 +$(i386_ONLY)file \ + path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml mode=0444 $(i386_ONLY)file \ path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-legacy-hc-topology.xml \ mode=0444 @@ -505,8 +514,10 @@ $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/psu-hc-topology.xml \ $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/chip.so mode=0555 $(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/hostbridge.so \ mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so mode=0555 +$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so \ + mode=0555 +$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so \ + mode=0555 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/fire.eft mode=0444 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/oberon.eft mode=0444 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/eft/psycho.eft mode=0444 @@ -519,18 +530,20 @@ $(sparc_ONLY)file \ path=usr/platform/sun4u/lib/fm/fmd/plugins/USII-io-diagnosis.so mode=0555 $(sparc_ONLY)file \ path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.conf -$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.so \ - mode=0555 +$(sparc_ONLY)file \ + path=usr/platform/sun4u/lib/fm/fmd/plugins/cpumem-diagnosis.so mode=0555 $(sparc_ONLY)file \ path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.conf -$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.so \ - mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.conf +$(sparc_ONLY)file \ + path=usr/platform/sun4u/lib/fm/fmd/plugins/datapath-retire.so mode=0555 +$(sparc_ONLY)file \ + path=usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.conf $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/fmd/plugins/fps-transport.so \ mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/maps/sun4u-hc-topology.xml \ - mode=0444 -$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/chip.so mode=0555 +$(sparc_ONLY)file \ + path=usr/platform/sun4u/lib/fm/topo/maps/sun4u-hc-topology.xml mode=0444 +$(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/chip.so \ + mode=0555 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/hostbridge.so \ mode=0555 $(sparc_ONLY)file path=usr/platform/sun4u/lib/fm/topo/plugins/pcibus.so \ @@ -547,9 +560,10 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/vfncx.eft mode=0444 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/eft/zambezi.eft mode=0444 $(sparc_ONLY)file \ path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.conf -$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.so \ - mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.conf +$(sparc_ONLY)file \ + path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-diagnosis.so mode=0555 +$(sparc_ONLY)file \ + path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.conf $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/cpumem-retire.so \ mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/etm.conf @@ -557,12 +571,14 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/etm.so mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/generic-mem.conf $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/fmd/plugins/generic-mem.so \ mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/maps/sun4v-hc-topology.xml \ - mode=0444 -$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/chip.so mode=0555 +$(sparc_ONLY)file \ + path=usr/platform/sun4v/lib/fm/topo/maps/sun4v-hc-topology.xml mode=0444 +$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/chip.so \ + mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/cpuboard.so \ mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/dimm.so mode=0555 +$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/dimm.so \ + mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/hostbridge.so \ mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/motherboard.so \ @@ -576,7 +592,8 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/platform-mem.so \ mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/sun4vpi.so \ mode=0555 -$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/xaui.so mode=0555 +$(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/xaui.so \ + mode=0555 $(sparc_ONLY)file path=usr/platform/sun4v/lib/fm/topo/plugins/zambezi.so \ mode=0555 file path=usr/sbin/fmadm mode=0555 @@ -617,9 +634,11 @@ link path=usr/lib/fm/libfmevent.so target=libfmevent.so.1 $(sparc_ONLY)link path=usr/lib/fm/libldom.so target=libldom.so.1 $(sparc_ONLY)link path=usr/lib/fm/libmdesc.so target=libmdesc.so.1 link path=usr/lib/fm/libtopo.so target=libtopo.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-CP3260/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so @@ -634,7 +653,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-T6320/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Fire-T200/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fm/fmd/plugins/etm.so \ target=../../../../../sun4v/lib/fm/fmd/plugins/etm.so diff --git a/usr/src/pkg/manifests/service-file-system-nfs.mf b/usr/src/pkg/manifests/service-file-system-nfs.mf index 34fa9912e9..3cad270ffd 100644 --- a/usr/src/pkg/manifests/service-file-system-nfs.mf +++ b/usr/src/pkg/manifests/service-file-system-nfs.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/file-system/nfs@$(PKGVERS) @@ -30,19 +29,18 @@ set name=pkg.summary value="Network File System (NFS) server support" set name=info.classification \ value="org.opensolaris.category.2008:System/File System" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys dir path=etc/init.d group=sys dir path=etc/nfs group=sys -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/misc group=sys +dir path=kernel/misc/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nfs group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib @@ -53,19 +51,16 @@ dir path=usr/lib/nfs group=sys dir path=usr/lib/reparse group=bin dir path=usr/lib/reparse/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/nfs group=sys file path=etc/default/nfslogd group=sys \ original_name=SUNWnfss:etc/default/nfslogd preserve=true file path=etc/init.d/nfs.server group=sys mode=0744 \ original_name=SUNWnfss:etc/init.d/nfs.server preserve=true file path=etc/nfs/nfslog.conf group=sys \ original_name=SUNWnfss:etc/nfs/nfslog.conf preserve=true -file path=kernel/misc/$(ARCH64)/nfssrv group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/nfssrv group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global +file path=kernel/misc/$(ARCH64)/nfssrv group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/nfssrv group=sys mode=0755 +file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444 file path=lib/svc/method/nfs-server mode=0555 file path=usr/lib/fs/nfs/$(ARCH64)/libshare_nfs.so.1 file path=usr/lib/fs/nfs/libshare_nfs.so.1 @@ -77,8 +72,6 @@ file path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so.1 file path=usr/lib/reparse/libnfs_basic.so.1 file path=usr/sbin/exportfs mode=0555 file path=usr/sbin/nfsref mode=0555 -file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444 legacy pkg=SUNWnfsskr arch=$(ARCH) category=system \ desc="Network File System (NFS) server kernel support (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-file-system-smb.mf b/usr/src/pkg/manifests/service-file-system-smb.mf index 85eff65d80..d1a3a9b2dd 100644 --- a/usr/src/pkg/manifests/service-file-system-smb.mf +++ b/usr/src/pkg/manifests/service-file-system-smb.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/file-system/smb@$(PKGVERS) @@ -30,19 +29,16 @@ set name=pkg.summary value="SMB Server" set name=info.classification \ value="org.opensolaris.category.2008:System/File System" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/kmdb group=sys +dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/smb group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib @@ -52,9 +48,9 @@ dir path=usr/lib/fs/smb/$(ARCH64) group=sys dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys +dir path=usr/lib/reparse dir path=usr/lib/security dir path=usr/lib/smbsrv -dir path=usr/lib/reparse dir path=usr/sbin dir path=var group=sys dir path=var/smb group=sys @@ -63,36 +59,28 @@ dir path=var/smb/cvol/windows group=sys dir path=var/smb/cvol/windows/system32 group=sys dir path=var/smb/cvol/windows/system32/vss group=sys dir path=var/svc group=sys -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/smb group=sys driver name=smbsrv perms="* 0640 root sys" -file path=kernel/drv/$(ARCH64)/smbsrv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/smbsrv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/smbsrv.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/smbsrv group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/smbsrv group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=var/smb/cvol/windows/system32/eventlog.dll mode=0755 +file path=kernel/drv/$(ARCH64)/smbsrv group=sys +$(i386_ONLY)file path=kernel/drv/smbsrv group=sys +file path=kernel/drv/smbsrv.conf group=sys +file path=kernel/kmdb/$(ARCH64)/smbsrv group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/smbsrv group=sys mode=0555 +file path=lib/svc/manifest/network/smb/server.xml group=sys mode=0444 file path=lib/svc/method/svc-smbd mode=0555 file path=usr/lib/fs/smb/$(ARCH64)/libshare_smb.so.1 file path=usr/lib/fs/smb/libshare_smb.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/smbsrv.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/smbsrv.so group=sys mode=0555 -file path=usr/lib/security/pam_smb_passwd.so.1 file path=usr/lib/reparse/libreparse_smb.so.1 +file path=usr/lib/reparse/llib-lreparse_smb +file path=usr/lib/reparse/llib-lreparse_smb.ln +file path=usr/lib/security/pam_smb_passwd.so.1 file path=usr/lib/smbsrv/libmlrpc.so.1 file path=usr/lib/smbsrv/libmlsvc.so.1 file path=usr/lib/smbsrv/libsmb.so.1 file path=usr/lib/smbsrv/libsmbns.so.1 file path=usr/lib/smbsrv/libsmbrdr.so.1 file path=usr/lib/smbsrv/libsqlite.so.1 -file path=usr/lib/reparse/llib-lreparse_smb -file path=usr/lib/reparse/llib-lreparse_smb.ln file path=usr/lib/smbsrv/llib-lmlrpc file path=usr/lib/smbsrv/llib-lmlrpc.ln file path=usr/lib/smbsrv/llib-lmlsvc @@ -106,9 +94,9 @@ file path=usr/lib/smbsrv/llib-lsmbrdr.ln file path=usr/lib/smbsrv/smbd mode=0555 file path=usr/sbin/smbadm mode=0555 file path=usr/sbin/smbstat mode=0555 +file path=var/smb/cvol/windows/system32/eventlog.dll mode=0755 file path=var/smb/smbpasswd group=sys mode=0400 \ original_name=SUNWsmbs:var/smb/smbpasswd preserve=true -file path=lib/svc/manifest/network/smb/server.xml group=sys mode=0444 legacy pkg=SUNWsmbskr arch=$(ARCH) category=system \ desc="SMB Server kernel root components" \ hotline="Please contact your local service provider" \ @@ -126,8 +114,8 @@ legacy pkg=SUNWsmbsu arch=$(ARCH) category=system \ version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/security/pam_smb_passwd.so target=pam_smb_passwd.so.1 link path=usr/lib/reparse/libreparse_smb.so target=libreparse_smb.so.1 +link path=usr/lib/security/pam_smb_passwd.so target=pam_smb_passwd.so.1 link path=usr/lib/smbsrv/libmlrpc.so target=libmlrpc.so.1 link path=usr/lib/smbsrv/libmlsvc.so target=libmlsvc.so.1 link path=usr/lib/smbsrv/libsmb.so target=libsmb.so.1 diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf index a60bfa0c78..498e13a823 100644 --- a/usr/src/pkg/manifests/service-hal.mf +++ b/usr/src/pkg/manifests/service-hal.mf @@ -20,50 +20,39 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/hal@$(PKGVERS) set name=pkg.description \ value="Hardware Abstraction Layer, HAL (freedesktop.org)" set name=pkg.summary value="Hardware Abstraction Layer" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/dbus-1 opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/dbus-1/system.d opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/hal/fdi opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/hal/fdi/information opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/information/10freedesktop opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/information/20thirdparty opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/information/30user opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy/10osvendor opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy/20thirdparty opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/policy/30user opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe/10osvendor opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe/20thirdparty opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/hal/fdi/preprobe/30user opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys variant.opensolaris.zone=global +dir path=etc/dbus-1 variant.opensolaris.zone=global +dir path=etc/dbus-1/system.d variant.opensolaris.zone=global +dir path=etc/hal variant.opensolaris.zone=global +dir path=etc/hal/fdi variant.opensolaris.zone=global +dir path=etc/hal/fdi/information variant.opensolaris.zone=global +dir path=etc/hal/fdi/information/10freedesktop variant.opensolaris.zone=global +dir path=etc/hal/fdi/information/20thirdparty variant.opensolaris.zone=global +dir path=etc/hal/fdi/information/30user variant.opensolaris.zone=global +dir path=etc/hal/fdi/policy variant.opensolaris.zone=global +dir path=etc/hal/fdi/policy/10osvendor variant.opensolaris.zone=global +dir path=etc/hal/fdi/policy/20thirdparty variant.opensolaris.zone=global +dir path=etc/hal/fdi/policy/30user variant.opensolaris.zone=global +dir path=etc/hal/fdi/preprobe variant.opensolaris.zone=global +dir path=etc/hal/fdi/preprobe/10osvendor variant.opensolaris.zone=global +dir path=etc/hal/fdi/preprobe/20thirdparty variant.opensolaris.zone=global +dir path=etc/hal/fdi/preprobe/30user variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) @@ -76,53 +65,49 @@ dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/xml group=sys dir path=usr/share/lib/xml/dtd group=sys -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=etc/dbus-1/system.d/hal.conf opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=etc/dbus-1/system.d/hal.conf variant.opensolaris.zone=global file path=etc/hal/fdi/information/10freedesktop/10-camera-ptp.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi \ - mode=0444 opensolaris.zone=global variant.opensolaris.zone=global + mode=0444 variant.opensolaris.zone=global file path=etc/hal/fdi/information/10freedesktop/10-usb-music-players.fdi \ - mode=0444 opensolaris.zone=global variant.opensolaris.zone=global + mode=0444 variant.opensolaris.zone=global file path=etc/hal/fdi/information/10freedesktop/10-usb-pda.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global +file path=etc/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi \ + mode=0444 variant.opensolaris.zone=global file path=etc/hal/fdi/information/10freedesktop/10-wireless-mice.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/10-cpufreq.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi \ - mode=0444 opensolaris.zone=global variant.opensolaris.zone=global + mode=0444 variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/10-network-attached.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/10-toshiba-buttons.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/20-storage-methods.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/policy/10osvendor/20-zfs-methods.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/hal/fdi/preprobe/10osvendor/20-ignore-fixed-storage.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global +file path=etc/hal/fdi/preprobe/10osvendor/20-ignore-fixed-storage.fdi \ + mode=0444 variant.opensolaris.zone=global file path=etc/hal/fdi/preprobe/10osvendor/20-ignore-lofi.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global + variant.opensolaris.zone=global file path=etc/hal/fdi/preprobe/10osvendor/20-printers.fdi mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/method/svc-hal mode=0555 opensolaris.zone=global \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-network-discovery mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/network/network-discovery.xml group=sys mode=0444 \ + variant.opensolaris.zone=global +file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \ + variant.opensolaris.zone=global +file path=lib/svc/method/svc-hal mode=0555 variant.opensolaris.zone=global +file path=lib/svc/method/svc-network-discovery mode=0555 \ variant.opensolaris.zone=global file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0 file path=usr/lib/$(ARCH64)/libhal.so.1.0.0 @@ -180,10 +165,6 @@ file path=usr/sbin/hal-get-property mode=0555 file path=usr/sbin/hal-set-property mode=0555 file path=usr/sbin/lshal mode=0555 file path=usr/share/lib/xml/dtd/fdi.dtd.1 -file path=lib/svc/manifest/network/network-discovery.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWhal arch=$(ARCH) category=system \ desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \ hotline="Please contact your local service provider" \ @@ -198,7 +179,8 @@ license cmd/hal/LICENSE license=cmd/hal/LICENSE license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libhal-storage.so target=./libhal-storage.so.1.0.0 -link path=usr/lib/$(ARCH64)/libhal-storage.so.1 target=./libhal-storage.so.1.0.0 +link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \ + target=./libhal-storage.so.1.0.0 link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0 link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0 link path=usr/lib/libhal-storage.so target=./libhal-storage.so.1.0.0 diff --git a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf index b7c3bdd052..e0dc89edda 100644 --- a/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf +++ b/usr/src/pkg/manifests/service-key-management-sun-fire-15000.mf @@ -20,50 +20,42 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/service/key-management/sun-fire-15000@$(PKGVERS) set name=pkg.description value="Key Management Modules for Sun Fire 15000" set name=pkg.summary value="Key Management Modules for Sun Fire 15000" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global -dir path=platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/SUNW,Sun-Fire-15000 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/SUNW,Sun-Fire-15000/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/SUNW,Sun-Fire-15000/kernel/drv group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -dir path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64) group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4u group=sys +dir path=lib/svc/method +dir path=platform group=sys +dir path=platform/SUNW,Sun-Fire-15000 group=sys +dir path=platform/SUNW,Sun-Fire-15000/kernel group=sys +dir path=platform/SUNW,Sun-Fire-15000/kernel/drv group=sys +dir path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/platform group=sys dir path=usr/platform/sun4u group=sys dir path=usr/platform/sun4u/lib -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=sckmdrv perms="* 0600 root sys" -file path=lib/svc/method/svc-sckmd mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/sckmdrv group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=platform/SUNW,Sun-Fire-15000/kernel/drv/sckmdrv.conf group=sys \ - opensolaris.zone=global reboot-needed=false variant.opensolaris.zone=global +file path=lib/svc/manifest/platform/sun4u/sckmd.xml group=sys mode=0444 +file path=lib/svc/method/svc-sckmd mode=0555 +file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/sckmdrv group=sys +file path=platform/SUNW,Sun-Fire-15000/kernel/drv/sckmdrv.conf group=sys file path=usr/platform/sun4u/lib/sckmd group=sys mode=0755 -file path=lib/svc/manifest/platform/sun4u/sckmd.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWsckm.u arch=$(ARCH).sun4u category=system \ desc="Key Management Modules for Sun Fire 15000" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf b/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf index c17efe2bb4..d341dd671b 100644 --- a/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf +++ b/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf @@ -20,18 +20,18 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/service/network/dhcp/datastore/binfiles@$(PKGVERS) +set name=pkg.fmri \ + value=pkg:/service/network/dhcp/datastore/binfiles@$(PKGVERS) set name=pkg.description \ value="Binary File Format Public module exporting Version 1 of the Service Provider Interface. Used to store DHCP data, this module has much better performance than the ASCII files and nisplus public modules." set name=pkg.summary \ value="Binary File Format Data Module for BOOTP/DHCP Services" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet @@ -49,4 +49,5 @@ legacy pkg=SUNWdhcsb arch=$(ARCH) category=system \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/inet/dhcp/svc/ds_SUNWbinfiles.so target=./ds_SUNWbinfiles.so.1 +link path=usr/lib/inet/dhcp/svc/ds_SUNWbinfiles.so \ + target=./ds_SUNWbinfiles.so.1 diff --git a/usr/src/pkg/manifests/service-network-dhcp.mf b/usr/src/pkg/manifests/service-network-dhcp.mf index f0c2953b8e..5b91686bf0 100644 --- a/usr/src/pkg/manifests/service-network-dhcp.mf +++ b/usr/src/pkg/manifests/service-network-dhcp.mf @@ -20,22 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/dhcp@$(PKGVERS) set name=pkg.description \ value="Usr filesystem portion of the SunOS BOOTP/DHCP service, which uses the BOOT Protocol and/or Dynamic Host Configuration Protocol to provide network configuration parameters to BOOTP/DHCP clients. Administration utilities for the service are included." set name=pkg.summary value="BOOTP/DHCP Server Services" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/inet group=sys dir path=etc/init.d group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib @@ -45,9 +46,8 @@ dir path=usr/lib/inet/dhcp/nsu dir path=usr/lib/inet/dhcp/svc dir path=usr/lib/inet/dhcp/svcadm dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys file path=etc/init.d/dhcp group=sys mode=0744 +file path=lib/svc/manifest/network/dhcp-server.xml group=sys mode=0444 file path=usr/include/dhcp_svc_public.h file path=usr/lib/inet/dhcp/nsu/rfc2136.so.1 file path=usr/lib/inet/dhcp/svc/ds_SUNWfiles.so.0 @@ -64,7 +64,6 @@ file path=usr/lib/libdhcpsvc.so.1 file path=usr/sbin/dhcpconfig mode=0555 file path=usr/sbin/dhtadm mode=0555 file path=usr/sbin/pntadm mode=0555 -file path=lib/svc/manifest/network/dhcp-server.xml group=sys mode=0444 legacy pkg=SUNWdhcsr arch=$(ARCH) category=system \ desc="Root filesystem portion of the SunOS BOOTP/DHCP service, which uses the BOOT Protocol and/or Dynamic Host Configuration Protocol to provide network configuration parameters to BOOTP/DHCP clients. Administration utilities for the service are included." \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf index fa289ac4f2..56834774d6 100644 --- a/usr/src/pkg/manifests/service-network-dns-mdns.mf +++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf @@ -20,19 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/dns/mdns@$(PKGVERS) set name=pkg.description \ value="Root components for Multicast DNS daemon and service discovery support" set name=pkg.summary value="Multicast DNS and Service Discovery" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/dns group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/include @@ -50,9 +52,7 @@ dir path=usr/share/lib/java/javadoc/dnssd/api/com/apple group=other dir path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd group=other dir path=usr/share/lib/java/javadoc/dnssd/api/resources group=other dir path=usr/share/lib/java/javadoc/dnssd/examples group=other -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/dns group=sys +file path=lib/svc/manifest/network/dns/multicast.xml group=sys mode=0444 file path=usr/bin/dns-sd mode=0555 file path=usr/include/dns_sd.h file path=usr/lib/$(ARCH64)/libdns_sd.so.1 @@ -66,10 +66,12 @@ file path=usr/lib/llib-ldns_sd file path=usr/lib/llib-ldns_sd.ln file path=usr/lib/nss_mdns.so.1 file path=usr/share/lib/java/dnssd.jar group=sys -file path=usr/share/lib/java/javadoc/dnssd/api/allclasses-frame.html group=other +file path=usr/share/lib/java/javadoc/dnssd/api/allclasses-frame.html \ + group=other file path=usr/share/lib/java/javadoc/dnssd/api/allclasses-noframe.html \ group=other -file path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/BaseListener.html \ +file \ + path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/BaseListener.html \ group=other file \ path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/BrowseListener.html \ @@ -87,7 +89,8 @@ file \ file \ path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/DNSSDRegistration.html \ group=other -file path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/DNSSDService.html \ +file \ + path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/DNSSDService.html \ group=other file \ path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/DomainListener.html \ @@ -112,21 +115,25 @@ file \ file \ path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/package-summary.html \ group=other -file path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/package-tree.html \ +file \ + path=usr/share/lib/java/javadoc/dnssd/api/com/apple/dnssd/package-tree.html \ + group=other +file path=usr/share/lib/java/javadoc/dnssd/api/constant-values.html \ + group=other +file path=usr/share/lib/java/javadoc/dnssd/api/deprecated-list.html \ group=other -file path=usr/share/lib/java/javadoc/dnssd/api/constant-values.html group=other -file path=usr/share/lib/java/javadoc/dnssd/api/deprecated-list.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/help-doc.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/index-all.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/index.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/overview-tree.html group=other file path=usr/share/lib/java/javadoc/dnssd/api/package-list group=other -file path=usr/share/lib/java/javadoc/dnssd/api/resources/inherit.gif group=other -file path=usr/share/lib/java/javadoc/dnssd/api/serialized-form.html group=other +file path=usr/share/lib/java/javadoc/dnssd/api/resources/inherit.gif \ + group=other +file path=usr/share/lib/java/javadoc/dnssd/api/serialized-form.html \ + group=other file path=usr/share/lib/java/javadoc/dnssd/api/stylesheet.css group=other file path=usr/share/lib/java/javadoc/dnssd/examples/BrowserApp.jar group=sys file path=usr/share/lib/java/javadoc/dnssd/examples/SimpleChat.jar group=sys -file path=lib/svc/manifest/network/dns/multicast.xml group=sys mode=0444 legacy pkg=SUNWdsdr arch=$(ARCH) category=system \ desc="Root components for Multicast DNS daemon and service discovery support" \ hotline="Please contact your local service provider" \ @@ -140,7 +147,8 @@ legacy pkg=SUNWdsdu arch=$(ARCH) category=system \ license cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE \ license=cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE license cr_Sun license=cr_Sun -license lib/libdns_sd/THIRDPARTYLICENSE license=lib/libdns_sd/THIRDPARTYLICENSE +license lib/libdns_sd/THIRDPARTYLICENSE \ + license=lib/libdns_sd/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libdns_sd.so target=libdns_sd.so.1 link path=usr/lib/$(ARCH64)/libjdns_sd.so target=libjdns_sd.so.1 diff --git a/usr/src/pkg/manifests/service-network-ftp.mf b/usr/src/pkg/manifests/service-network-ftp.mf index 22b3635239..d8ee3fcfb5 100644 --- a/usr/src/pkg/manifests/service-network-ftp.mf +++ b/usr/src/pkg/manifests/service-network-ftp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/ftp@$(PKGVERS) @@ -29,26 +28,26 @@ set name=pkg.description value="FTP Server and Utilities" set name=pkg.summary value="FTP Server" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/ftpd group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -file path=etc/ftpd/ftpaccess group=sys original_name=SUNWftp:etc/ftpd/ftpaccess \ - preserve=true +file path=etc/ftpd/ftpaccess group=sys \ + original_name=SUNWftp:etc/ftpd/ftpaccess preserve=true file path=etc/ftpd/ftpconversions group=sys \ original_name=SUNWftp:etc/ftpd/ftpconversions preserve=true -file path=etc/ftpd/ftpgroups group=sys original_name=SUNWftp:etc/ftpd/ftpgroups \ - preserve=true +file path=etc/ftpd/ftpgroups group=sys \ + original_name=SUNWftp:etc/ftpd/ftpgroups preserve=true file path=etc/ftpd/ftphosts group=sys original_name=SUNWftp:etc/ftpd/ftphosts \ preserve=true file path=etc/ftpd/ftpservers group=sys \ original_name=SUNWftp:etc/ftpd/ftpservers preserve=true +file path=lib/svc/manifest/network/ftp.xml group=sys mode=0444 file path=lib/svc/method/svc-ftp mode=0555 file path=usr/sbin/ftpaddhost mode=0555 file path=usr/sbin/ftpconfig mode=0555 @@ -57,14 +56,14 @@ file path=usr/sbin/ftprestart mode=0555 file path=usr/sbin/ftpshut mode=0555 file path=usr/sbin/in.ftpd mode=0555 file path=usr/sbin/privatepw mode=0555 -file path=lib/svc/manifest/network/ftp.xml group=sys mode=0444 hardlink path=usr/sbin/ftpwho target=../../usr/sbin/ftpcount legacy pkg=SUNWftpr arch=$(ARCH) category=system \ desc="FTP Server Configuration Files" \ hotline="Please contact your local service provider" \ name="FTP Server, (Root)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 -legacy pkg=SUNWftpu arch=$(ARCH) category=system desc="FTP Server and Utilities" \ +legacy pkg=SUNWftpu arch=$(ARCH) category=system \ + desc="FTP Server and Utilities" \ hotline="Please contact your local service provider" \ name="FTP Server, (Usr)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/service-network-legacy.mf b/usr/src/pkg/manifests/service-network-legacy.mf index 3d2bade767..ad5417ca32 100644 --- a/usr/src/pkg/manifests/service-network-legacy.mf +++ b/usr/src/pkg/manifests/service-network-legacy.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/legacy@$(PKGVERS) @@ -29,26 +28,26 @@ set name=pkg.description \ value="Common Network Services: time, daytime, echo, discard, chargen" set name=pkg.summary \ value="Common Network Services: time, daytime, echo, discard, chargen" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -file path=usr/lib/inet/in.chargend mode=0555 -file path=usr/lib/inet/in.daytimed mode=0555 -file path=usr/lib/inet/in.discardd mode=0555 -file path=usr/lib/inet/in.echod mode=0555 -file path=usr/lib/inet/in.timed mode=0555 file path=lib/svc/manifest/network/chargen.xml group=sys mode=0444 file path=lib/svc/manifest/network/daytime.xml group=sys mode=0444 file path=lib/svc/manifest/network/discard.xml group=sys mode=0444 file path=lib/svc/manifest/network/echo.xml group=sys mode=0444 file path=lib/svc/manifest/network/time.xml group=sys mode=0444 +file path=usr/lib/inet/in.chargend mode=0555 +file path=usr/lib/inet/in.daytimed mode=0555 +file path=usr/lib/inet/in.discardd mode=0555 +file path=usr/lib/inet/in.echod mode=0555 +file path=usr/lib/inet/in.timed mode=0555 legacy pkg=SUNWcnsr arch=$(ARCH) category=system \ desc="Common Network Services (Root): time, daytime, echo, discard, chargen" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf index e37eaf48eb..4710f57e43 100644 --- a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf +++ b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/load-balancer/ilb@$(PKGVERS) @@ -31,9 +30,11 @@ set name=pkg.summary value="Integrated IP layer 3/4 load balancer for Solaris" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/loadbalancer group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib @@ -41,9 +42,7 @@ dir path=usr/lib/$(ARCH64) dir path=usr/lib/inet dir path=usr/lib/inet/ilb dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/loadbalancer group=sys +file path=lib/svc/manifest/network/loadbalancer/ilbd.xml group=sys mode=0444 file path=usr/include/libilb.h file path=usr/lib/$(ARCH64)/libilb.so.1 file path=usr/lib/$(ARCH64)/llib-lilb.ln @@ -53,7 +52,6 @@ file path=usr/lib/libilb.so.1 file path=usr/lib/llib-lilb file path=usr/lib/llib-lilb.ln file path=usr/sbin/ilbadm mode=0555 -file path=lib/svc/manifest/network/loadbalancer/ilbd.xml group=sys mode=0444 legacy pkg=SUNWilb arch=$(ARCH) category=system \ desc="Integrated IP layer 3/4 load balancer for Solaris (usr)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-network-clients.mf b/usr/src/pkg/manifests/service-network-network-clients.mf index 59bb0eb483..c017d175c2 100644 --- a/usr/src/pkg/manifests/service-network-network-clients.mf +++ b/usr/src/pkg/manifests/service-network-network-clients.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/network-clients@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Remote Network Client Commands" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/service-network-network-servers.mf b/usr/src/pkg/manifests/service-network-network-servers.mf index 3fbff608fb..78bc884839 100644 --- a/usr/src/pkg/manifests/service-network-network-servers.mf +++ b/usr/src/pkg/manifests/service-network-network-servers.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/network-servers@$(PKGVERS) @@ -30,10 +29,12 @@ set name=pkg.description \ set name=pkg.summary value="Remote Network Server Commands" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal +dir path=etc group=sys dir path=lib dir path=lib/svc -dir path=etc group=sys +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/rpc group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -43,9 +44,16 @@ dir path=usr/lib/netsvc/rusers group=sys dir path=usr/lib/netsvc/rwall group=sys dir path=usr/lib/netsvc/spray group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/rpc group=sys +file path=lib/svc/manifest/network/comsat.xml group=sys mode=0444 +file path=lib/svc/manifest/network/finger.xml group=sys mode=0444 +file path=lib/svc/manifest/network/login.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rexec.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/rstat.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/rusers.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/spray.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/wall.xml group=sys mode=0444 +file path=lib/svc/manifest/network/shell.xml group=sys mode=0444 +file path=lib/svc/manifest/network/talk.xml group=sys mode=0444 file path=usr/bin/finger mode=0555 file path=usr/bin/rwho mode=0555 file path=usr/bin/talk mode=0555 @@ -60,16 +68,6 @@ file path=usr/sbin/in.rlogind mode=0555 file path=usr/sbin/in.rshd mode=0555 file path=usr/sbin/in.rwhod mode=0555 file path=usr/sbin/in.talkd mode=0555 -file path=lib/svc/manifest/network/comsat.xml group=sys mode=0444 -file path=lib/svc/manifest/network/finger.xml group=sys mode=0444 -file path=lib/svc/manifest/network/login.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rexec.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rpc/rstat.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rpc/rusers.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rpc/spray.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rpc/wall.xml group=sys mode=0444 -file path=lib/svc/manifest/network/shell.xml group=sys mode=0444 -file path=lib/svc/manifest/network/talk.xml group=sys mode=0444 legacy pkg=SUNWrcmdr arch=$(ARCH) category=system \ desc="Remote Network Server Commands (Root)" \ hotline="Please contact your local service provider" \ @@ -78,8 +76,8 @@ legacy pkg=SUNWrcmdr arch=$(ARCH) category=system \ legacy pkg=SUNWrcmds arch=$(ARCH) category=system \ desc="Remote Network Server Commands (includes finger, talk, rwho commands)" \ hotline="Please contact your local service provider" \ - name="Remote Network Server Commands (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Remote Network Server Commands (Usr)" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat \ license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind \ diff --git a/usr/src/pkg/manifests/service-network-nis.mf b/usr/src/pkg/manifests/service-network-nis.mf index 571a70cc69..470ddbf323 100644 --- a/usr/src/pkg/manifests/service-network-nis.mf +++ b/usr/src/pkg/manifests/service-network-nis.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/nis@$(PKGVERS) @@ -30,24 +29,27 @@ set name=pkg.summary value="NIS Server for Solaris" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nis group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/netsvc group=sys dir path=usr/lib/netsvc/yp dir path=usr/sbin dir path=var group=sys -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/nis group=sys dir path=var/yp dir path=var/yp/binding file path=etc/default/yppasswdd group=sys \ original_name=SUNWyp:etc/default/yppasswdd preserve=renamenew +file path=lib/svc/manifest/network/nis/passwd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/server.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/update.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nis/xfr.xml group=sys mode=0444 file path=usr/lib/netsvc/yp/inityp2l mode=0555 file path=usr/lib/netsvc/yp/mkalias mode=0555 file path=usr/lib/netsvc/yp/multi mode=0555 @@ -66,10 +68,6 @@ file path=usr/lib/netsvc/yp/ypxfr_2perday mode=0555 file path=usr/lib/netsvc/yp/ypxfrd mode=0555 file path=usr/sbin/mknetid mode=0555 file path=usr/sbin/revnetgroup mode=0555 -file path=lib/svc/manifest/network/nis/passwd.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nis/server.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nis/update.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nis/xfr.xml group=sys mode=0444 file path=var/yp/Makefile mode=0555 original_name=SUNWyp:var/yp/Makefile \ preserve=renamenew file path=var/yp/updaters mode=0500 diff --git a/usr/src/pkg/manifests/service-network-slp.mf b/usr/src/pkg/manifests/service-network-slp.mf index 7717f6c69c..596ee766e8 100644 --- a/usr/src/pkg/manifests/service-network-slp.mf +++ b/usr/src/pkg/manifests/service-network-slp.mf @@ -20,23 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/slp@$(PKGVERS) set name=pkg.description \ value="Usr filesystem portion of the Service Location Protocol (SLP) framework. Included are C and Java developer libraries and a daemon which can act as a directory agent (DA)." set name=pkg.summary value=SLP -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/inet group=sys dir path=etc/init.d group=sys dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/include @@ -46,9 +46,9 @@ dir path=usr/lib/inet dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/slp -dir path=lib/svc/manifest/network group=sys file path=etc/inet/slp.conf.example group=sys file path=etc/init.d/slpd group=sys mode=0744 +file path=lib/svc/manifest/network/slp.xml group=sys mode=0444 file path=lib/svc/method/slp mode=0555 file path=usr/include/slp.h file path=usr/lib/$(ARCH64)/libslp.so.1 @@ -59,7 +59,6 @@ file path=usr/lib/llib-lslp file path=usr/lib/llib-lslp.ln file path=usr/share/lib/slp/slp.jar group=sys file path=usr/share/lib/slp/slpd.jar group=sys mode=0600 -file path=lib/svc/manifest/network/slp.xml group=sys mode=0444 legacy pkg=SUNWslpr arch=$(ARCH) category=system \ desc="Root filesystem portion of the Service Location Protocol (SLP) framework. Includes the SLP configuration file and start scripts for the SLP daemon." \ hotline="Please contact your local service provider" name="SLP, (Root)" \ diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf index d54de7511f..099af80d17 100644 --- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf +++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -30,7 +29,6 @@ set name=pkg.description value="Sendmail Utilities" set name=pkg.summary value=Sendmail set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=etc/mail group=mail @@ -45,6 +43,7 @@ dir path=etc/mail/cf/sh group=mail dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=lib/svc/share dir path=usr group=sys @@ -63,10 +62,10 @@ dir path=var/adm/sm.bin group=sys dir path=var/spool dir path=var/spool/clientmqueue group=smmsp mode=0770 owner=smmsp dir path=var/spool/mqueue mode=0750 -dir path=lib/svc/manifest/network group=sys file path=etc/init.d/sendmail group=sys mode=0744 \ original_name=SUNWsndm:etc/init.d/sendmail preserve=true -file path=etc/mail/aliases original_name=SUNWsndm:etc/mail/aliases preserve=true +file path=etc/mail/aliases original_name=SUNWsndm:etc/mail/aliases \ + preserve=true file path=etc/mail/cf/README group=mail mode=0444 file path=etc/mail/cf/cf/Makefile group=mail mode=0444 file path=etc/mail/cf/cf/sendmail.cf group=mail mode=0444 @@ -76,7 +75,8 @@ file path=etc/mail/cf/cf/submit.mc group=mail mode=0444 file path=etc/mail/cf/domain/generic.m4 group=mail mode=0444 file path=etc/mail/cf/domain/solaris-antispam.m4 group=mail mode=0444 file path=etc/mail/cf/domain/solaris-generic.m4 group=mail mode=0444 -file path=etc/mail/cf/feature/accept_unqualified_senders.m4 group=mail mode=0444 +file path=etc/mail/cf/feature/accept_unqualified_senders.m4 group=mail \ + mode=0444 file path=etc/mail/cf/feature/accept_unresolvable_domains.m4 group=mail \ mode=0444 file path=etc/mail/cf/feature/access_db.m4 group=mail mode=0444 @@ -113,7 +113,8 @@ file path=etc/mail/cf/feature/nocanonify.m4 group=mail mode=0444 file path=etc/mail/cf/feature/notsticky.m4 group=mail mode=0444 file path=etc/mail/cf/feature/nouucp.m4 group=mail mode=0444 file path=etc/mail/cf/feature/nullclient.m4 group=mail mode=0444 -file path=etc/mail/cf/feature/preserve_local_plus_detail.m4 group=mail mode=0444 +file path=etc/mail/cf/feature/preserve_local_plus_detail.m4 group=mail \ + mode=0444 file path=etc/mail/cf/feature/preserve_luser_host.m4 group=mail mode=0444 file path=etc/mail/cf/feature/promiscuous_relay.m4 group=mail mode=0444 file path=etc/mail/cf/feature/queuegroup.m4 group=mail mode=0444 @@ -151,10 +152,12 @@ file path=etc/mail/local-host-names \ original_name=SUNWsndm:etc/mail/local-host-names preserve=true file path=etc/mail/sendmail.cf mode=0444 \ original_name=SUNWsndm:etc/mail/sendmail.cf preserve=renameold -file path=etc/mail/submit.cf mode=0444 original_name=SUNWsndm:etc/mail/submit.cf \ - preserve=renameold +file path=etc/mail/submit.cf mode=0444 \ + original_name=SUNWsndm:etc/mail/submit.cf preserve=renameold file path=etc/mail/trusted-users original_name=SUNWsndm:etc/mail/trusted-users \ preserve=true +file path=lib/svc/manifest/network/sendmail-client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/smtp-sendmail.xml group=sys mode=0444 file path=lib/svc/method/sendmail-client mode=0555 file path=lib/svc/method/smtp-sendmail mode=0555 file path=lib/svc/share/sendmail_include.sh mode=0444 @@ -180,15 +183,15 @@ file path=usr/sbin/check-permissions group=mail mode=0555 file path=usr/sbin/editmap mode=0555 file path=usr/sbin/etrn mode=0555 file path=usr/sbin/makemap mode=0555 -file path=lib/svc/manifest/network/sendmail-client.xml group=sys mode=0444 -file path=lib/svc/manifest/network/smtp-sendmail.xml group=sys mode=0444 legacy pkg=SUNWsndmr arch=$(ARCH) category=system \ desc="Sendmail Configuration Files" \ - hotline="Please contact your local service provider" name="Sendmail (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="Sendmail (root)" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 legacy pkg=SUNWsndmu arch=$(ARCH) category=system desc="Sendmail Utilities" \ - hotline="Please contact your local service provider" name="Sendmail (/usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="Sendmail (/usr)" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cmd/sendmail/THIRDPARTYLICENSE license=cmd/sendmail/THIRDPARTYLICENSE license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf b/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf index 090f2b64eb..d688a83326 100644 --- a/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf +++ b/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/snmp/mibiisa@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Solstice Enterprise Agents 1.0.3 SNMP daemon" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/snmp group=sys diff --git a/usr/src/pkg/manifests/service-network-ssh.mf b/usr/src/pkg/manifests/service-network-ssh.mf index 56703e86f7..a67ad8e2b4 100644 --- a/usr/src/pkg/manifests/service-network-ssh.mf +++ b/usr/src/pkg/manifests/service-network-ssh.mf @@ -20,32 +20,31 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/ssh@$(PKGVERS) set name=pkg.description value="Secure Shell protocol Server" set name=pkg.summary value="SSH Server" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/ssh group=sys dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib dir path=usr/lib/ssh -dir path=lib/svc/manifest/network group=sys file path=etc/ssh/sshd_config group=sys \ original_name=SUNWsshd:etc/ssh/sshd_config preserve=true +file path=lib/svc/manifest/network/ssh.xml group=sys mode=0444 file path=lib/svc/method/sshd mode=0555 file path=usr/lib/ssh/sftp-server mode=0555 file path=usr/lib/ssh/sshd mode=0555 -file path=lib/svc/manifest/network/ssh.xml group=sys mode=0444 legacy pkg=SUNWsshdr arch=$(ARCH) category=system \ desc="Secure Shell protocol Server" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-telnet.mf b/usr/src/pkg/manifests/service-network-telnet.mf index 1944cc94a0..0900558677 100644 --- a/usr/src/pkg/manifests/service-network-telnet.mf +++ b/usr/src/pkg/manifests/service-network-telnet.mf @@ -20,28 +20,27 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/telnet@$(PKGVERS) set name=pkg.description value="Telnet Server Daemon" set name=pkg.summary value="Telnet Server Daemon" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys -dir path=usr group=sys -dir path=usr/sbin dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/network group=sys +dir path=usr group=sys +dir path=usr/sbin file path=etc/default/telnetd group=sys \ original_name=SUNWtnetd:etc/default/telnetd preserve=true -file path=usr/sbin/in.telnetd mode=0555 file path=lib/svc/manifest/network/telnet.xml group=sys mode=0444 +file path=usr/sbin/in.telnetd mode=0555 legacy pkg=SUNWtnetd arch=$(ARCH) category=system \ desc="Telnet Server Daemon (Usr)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-network-tftp.mf b/usr/src/pkg/manifests/service-network-tftp.mf index 788abb8102..1ea4e95c01 100644 --- a/usr/src/pkg/manifests/service-network-tftp.mf +++ b/usr/src/pkg/manifests/service-network-tftp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/tftp@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Trivial File Transfer Server" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/sbin @@ -44,7 +42,7 @@ legacy pkg=SUNWtftp arch=$(ARCH) category=system \ legacy pkg=SUNWtftpr arch=$(ARCH) category=system \ desc="Trivial File Transfer Server (Root)" \ hotline="Please contact your local service provider" \ - name="Trivial File Transfer Server (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Trivial File Transfer Server (Root)" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-network-uucp.mf b/usr/src/pkg/manifests/service-network-uucp.mf index 9f60bb20ca..dae10971d0 100644 --- a/usr/src/pkg/manifests/service-network-uucp.mf +++ b/usr/src/pkg/manifests/service-network-uucp.mf @@ -20,20 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/uucp@$(PKGVERS) set name=pkg.description value="UUCP utilities and daemon" set name=pkg.summary value="Networking UUCP Utilities" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=etc/rc2.d group=sys dir path=etc/uucp group=uucp owner=uucp +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -46,10 +49,6 @@ dir path=var/spool/uucp/.Corrupt group=uucp owner=uucp dir path=var/spool/uucp/.Workspace group=uucp owner=uucp dir path=var/spool/uucp/.Xqtdir group=uucp owner=uucp dir path=var/spool/uucppublic group=uucp mode=1777 owner=uucp -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys dir path=var/uucp group=uucp owner=uucp dir path=var/uucp/.Admin group=uucp owner=uucp dir path=var/uucp/.Log group=uucp owner=uucp @@ -64,12 +63,12 @@ file path=etc/init.d/uucp group=sys mode=0744 \ original_name=SUNWbnu:etc/init.d/uucp preserve=true file path=etc/uucp/Config group=uucp original_name=SUNWbnu:etc/uucp/Config \ owner=uucp preserve=true -file path=etc/uucp/Devconfig group=uucp original_name=SUNWbnu:etc/uucp/Devconfig \ - owner=uucp preserve=true +file path=etc/uucp/Devconfig group=uucp \ + original_name=SUNWbnu:etc/uucp/Devconfig owner=uucp preserve=true file path=etc/uucp/Devices group=uucp original_name=SUNWbnu:etc/uucp/Devices \ owner=uucp preserve=true -file path=etc/uucp/Dialcodes group=uucp original_name=SUNWbnu:etc/uucp/Dialcodes \ - owner=uucp preserve=true +file path=etc/uucp/Dialcodes group=uucp \ + original_name=SUNWbnu:etc/uucp/Dialcodes owner=uucp preserve=true file path=etc/uucp/Dialers group=uucp original_name=SUNWbnu:etc/uucp/Dialers \ owner=uucp preserve=true file path=etc/uucp/Grades group=uucp original_name=SUNWbnu:etc/uucp/Grades \ @@ -84,6 +83,7 @@ file path=etc/uucp/Sysfiles group=uucp original_name=SUNWbnu:etc/uucp/Sysfiles \ owner=uucp preserve=true file path=etc/uucp/Systems group=uucp mode=0600 \ original_name=SUNWbnu:etc/uucp/Systems owner=uucp preserve=true +file path=lib/svc/manifest/network/uucp.xml group=sys mode=0444 file path=usr/bin/ct group=uucp mode=4511 file path=usr/bin/cu group=uucp mode=4511 owner=uucp file path=usr/bin/uucp group=uucp mode=4511 owner=uucp @@ -108,7 +108,6 @@ file path=usr/lib/uucp/uudemon.poll group=uucp mode=0555 file path=usr/lib/uucp/uusched group=uucp mode=4511 owner=uucp file path=usr/lib/uucp/uuxqt group=uucp mode=4511 owner=uucp file path=usr/sbin/in.uucpd group=uucp mode=0555 -file path=lib/svc/manifest/network/uucp.xml group=sys mode=0444 hardlink path=etc/rc2.d/S70uucp target=../../etc/init.d/uucp legacy pkg=SUNWbnur arch=$(ARCH) category=system \ desc="configuration and start-up files for UUCP utilities" \ diff --git a/usr/src/pkg/manifests/service-network-wpa.mf b/usr/src/pkg/manifests/service-network-wpa.mf index 7fe1edfd23..1cc0f3cd2e 100644 --- a/usr/src/pkg/manifests/service-network-wpa.mf +++ b/usr/src/pkg/manifests/service-network-wpa.mf @@ -20,26 +20,25 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/network/wpa@$(PKGVERS) set name=pkg.description \ value="The service implements the IEEE802.11i (WPA/WPA2) specification." set name=pkg.summary value="Wireless WPA Supplicant" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=usr group=sys -dir path=usr/lib -dir path=usr/lib/inet dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/network group=sys -file path=usr/lib/inet/wpad mode=0555 +dir path=usr group=sys +dir path=usr/lib +dir path=usr/lib/inet file path=lib/svc/manifest/network/wpa.xml group=sys mode=0444 +file path=usr/lib/inet/wpad mode=0555 legacy pkg=SUNWwpar arch=$(ARCH) category=system \ desc="The service implements the IEEE802.11i (WPA/WPA2) specification." \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf index 1f073f5ae0..c7c3164f4b 100644 --- a/usr/src/pkg/manifests/service-picl.mf +++ b/usr/src/pkg/manifests/service-picl.mf @@ -29,7 +29,9 @@ set name=pkg.description \ set name=pkg.summary value="PICL Libraries, and Plugin Modules" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) @@ -45,11 +47,13 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl/plugins group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib/picl group=sys @@ -61,11 +65,13 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T4/lib/picl/plugins group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib/picl group=sys @@ -84,43 +90,53 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins \ $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/sun4u group=sys $(sparc_ONLY)dir path=usr/platform/sun4u/lib $(sparc_ONLY)dir path=usr/platform/sun4u/lib/picl group=sys @@ -130,11 +146,7 @@ $(sparc_ONLY)dir path=usr/platform/sun4v/lib $(sparc_ONLY)dir path=usr/platform/sun4v/lib/picl group=sys $(sparc_ONLY)dir path=usr/platform/sun4v/lib/picl/plugins group=sys dir path=usr/sbin -dir path=lib opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ +file path=lib/svc/manifest/system/picl.xml group=sys mode=0444 \ variant.opensolaris.zone=global file path=usr/lib/$(ARCH64)/libpicl.so.1 file path=usr/lib/$(ARCH64)/llib-lpicl.ln @@ -169,7 +181,8 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/envmond.conf group=sys + path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/envmond.conf \ + group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so.1 \ group=sys @@ -192,9 +205,11 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/libfcal_leds.so.1 \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/picldevtree.conf group=sys + path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/picldevtree.conf \ + group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/piclfrutree.conf group=sys + path=usr/platform/SUNW,Netra-T4/lib/picl/plugins/piclfrutree.conf \ + group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Serverblade1/lib/picl/plugins/libpicllom.so.1 \ group=sys @@ -205,7 +220,8 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Serverblade1/lib/picl/plugins/piclfrutree.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Serverblade1/lib/picl/plugins/picllom.conf group=sys + path=usr/platform/SUNW,Serverblade1/lib/picl/plugins/picllom.conf \ + group=sys $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/envmodel.conf \ @@ -285,8 +301,8 @@ $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/platsvcd.conf \ group=sys mode=0444 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/psvcobj.conf \ group=sys mode=0444 -$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1 \ - group=sys +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1 group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so.1 \ group=sys @@ -301,8 +317,8 @@ $(sparc_ONLY)file \ group=sys $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/platsvcd.conf \ group=sys mode=0444 -$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/psvcobj.conf group=sys \ - mode=0444 +$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/psvcobj.conf \ + group=sys mode=0444 $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_FT0.conf \ group=sys @@ -343,7 +359,8 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_PS1.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_SC.conf group=sys + path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_SC.conf \ + group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins/fru_usb-a-1.conf \ group=sys @@ -387,7 +404,8 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_PS1.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_SC.conf group=sys + path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_SC.conf \ + group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins/fru_usb-a-1.conf \ group=sys @@ -440,7 +458,8 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_PS1.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_SC.conf group=sys + path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_SC.conf \ + group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/fru_usb-a-1.conf \ group=sys @@ -466,6 +485,18 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins/piclfrutree.conf \ group=sys $(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT0.conf \ + group=sys +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT1.conf \ + group=sys +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT2.conf \ + group=sys +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT3.conf \ + group=sys +$(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_HDD0.conf \ group=sys $(sparc_ONLY)file \ @@ -496,20 +527,9 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_PSU3.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT0.conf \ + path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_SC.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT1.conf \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT2.conf \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_FT3.conf \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/fru_SC.conf group=sys -$(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins/picldevtree.conf \ group=sys $(sparc_ONLY)file \ @@ -573,7 +593,8 @@ $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_PS3.conf \ group=sys $(sparc_ONLY)file \ - path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_SC.conf group=sys + path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_SC.conf \ + group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/fru_usb-a-1.conf \ group=sys @@ -626,8 +647,6 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libpriplugin.so.1 \ $(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so.1 \ group=sys file path=usr/sbin/prtpicl mode=0755 -file path=lib/svc/manifest/system/picl.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWpiclr arch=$(ARCH) category=system \ desc="PICL Framework init scripts" \ hotline="Please contact your local service provider" \ @@ -688,22 +707,26 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-100/lib/picl/plugins/libpiclmemcfg.so \ target=./libpiclmemcfg.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1000/lib/libprtdiag_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Blade-1000/lib/libprtdiag_psr.so.1 \ target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-1000/lib/picl/plugins/libpiclenvd.so \ target=./libpiclenvd.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-1500/lib/libprtdiag_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Blade-1500/lib/libprtdiag_psr.so.1 \ target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-1500/lib/picl/plugins/libpiclenvd.so \ target=./libpiclenvd.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-2500/lib/libprtdiag_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Blade-2500/lib/libprtdiag_psr.so.1 \ target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/libpiclenvd.so \ target=./libpiclenvd.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so \ target=./libpsvcpolicy_psr.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrutree.so \ @@ -714,7 +737,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin_psr.so \ target=./libpsvcplugin_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so \ target=./libpsvcpolicy_psr.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so \ @@ -779,7 +803,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins/libpiclfrudr.so.1 \ target=../../../../SUNW,Sun-Fire-V240/lib/picl/plugins/libpiclfrudr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so \ target=../../SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V490/lib/libpsvcpolicy_psr.so.1 \ @@ -805,7 +830,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins/piclfrutree.conf \ target=../../../../SUNW,Sun-Fire-480R/lib/picl/plugins/piclfrutree.conf -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so \ target=../../SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V890/lib/libpsvcpolicy_psr.so.1 \ diff --git a/usr/src/pkg/manifests/service-resource-cap.mf b/usr/src/pkg/manifests/service-resource-cap.mf index 06c2512625..1ed29417a2 100644 --- a/usr/src/pkg/manifests/service-resource-cap.mf +++ b/usr/src/pkg/manifests/service-resource-cap.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/resource-cap@$(PKGVERS) @@ -29,7 +28,10 @@ set name=pkg.description value="Solaris Resource Capping Daemon" set name=pkg.summary value="Solaris Resource Capping Daemon" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -37,15 +39,11 @@ dir path=usr/lib/rcap dir path=usr/lib/rcap/$(ARCH32) dir path=usr/lib/rcap/$(ARCH64) dir path=usr/sbin -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys +file path=lib/svc/manifest/system/rcap.xml group=sys mode=0444 file path=usr/bin/rcapstat mode=0555 file path=usr/lib/rcap/$(ARCH32)/rcapd mode=0555 file path=usr/lib/rcap/$(ARCH64)/rcapd mode=0555 file path=usr/sbin/rcapadm mode=0555 -file path=lib/svc/manifest/system/rcap.xml group=sys mode=0444 hardlink path=usr/lib/rcap/rcapd target=../isaexec legacy pkg=SUNWrcapr arch=$(ARCH) category=system \ desc="Solaris Resource Capping Daemon (Root)" \ diff --git a/usr/src/pkg/manifests/service-resource-pools-poold.mf b/usr/src/pkg/manifests/service-resource-pools-poold.mf index 598df7df1c..187e4564c9 100644 --- a/usr/src/pkg/manifests/service-resource-pools-poold.mf +++ b/usr/src/pkg/manifests/service-resource-pools-poold.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/resource-pools/poold@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="core software for dynamic resource pools" set name=pkg.summary value="Dynamic Resource Pools" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/pool diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.mf index 407187fc41..6e0c8a82b2 100644 --- a/usr/src/pkg/manifests/service-resource-pools.mf +++ b/usr/src/pkg/manifests/service-resource-pools.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/resource-pools@$(PKGVERS) @@ -29,10 +28,11 @@ set name=pkg.description value="core software for resource pools" set name=pkg.summary value="Resource Pools" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/bin dir path=usr/include @@ -48,20 +48,16 @@ dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/xml group=sys dir path=usr/share/lib/xml/dtd group=sys -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/adm/pool group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/log/pool group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=var group=sys variant.opensolaris.zone=global +dir path=var/adm/pool group=sys variant.opensolaris.zone=global +dir path=var/log/pool group=sys variant.opensolaris.zone=global driver name=pool perms="pool 0666 root sys" perms="poolctl 0666 root sys" -file path=lib/svc/method/svc-poold mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/system/poold.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-pools mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/system/pools.xml group=sys mode=0444 \ variant.opensolaris.zone=global +file path=lib/svc/method/svc-poold mode=0555 variant.opensolaris.zone=global +file path=lib/svc/method/svc-pools mode=0555 variant.opensolaris.zone=global file path=usr/bin/poolstat mode=0555 file path=usr/include/pool.h file path=usr/kernel/drv/$(ARCH64)/pool group=sys @@ -77,14 +73,11 @@ file path=usr/sbin/pooladm mode=0555 file path=usr/sbin/poolbind mode=0555 file path=usr/sbin/poolcfg mode=0555 file path=usr/share/lib/xml/dtd/rm_pool.dtd.1 -file path=lib/svc/manifest/system/poold.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/pools.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWpool arch=$(ARCH) category=system \ desc="core software for resource pools" \ - hotline="Please contact your local service provider" name="Resource Pools" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="Resource Pools" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 legacy pkg=SUNWpoolr arch=$(ARCH) category=system \ desc="core software for resource pools (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-security-gss.mf b/usr/src/pkg/manifests/service-security-gss.mf index f61821cb0a..a4254355c1 100644 --- a/usr/src/pkg/manifests/service-security-gss.mf +++ b/usr/src/pkg/manifests/service-security-gss.mf @@ -27,9 +27,9 @@ set name=pkg.fmri value=pkg:/service/security/gss@$(PKGVERS) set name=pkg.description \ value="Generic Security Service Application Program Interface, Version 2 - config" set name=pkg.summary value="GSSAPI CONFIG V2" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/gss group=sys dir path=lib @@ -41,7 +41,8 @@ file path=etc/gss/gsscred.conf group=sys \ original_name=SUNWgssc:etc/gss/gsscred.conf preserve=true file path=etc/gss/mech group=sys original_name=SUNWgssc:etc/gss/mech \ preserve=true -file path=etc/gss/qop group=sys original_name=SUNWgssc:etc/gss/qop preserve=true +file path=etc/gss/qop group=sys original_name=SUNWgssc:etc/gss/qop \ + preserve=true file path=lib/svc/manifest/network/rpc/gss.xml group=sys mode=0444 legacy pkg=SUNWgssc arch=$(ARCH) category=system \ desc="Generic Security Service Application Program Interface, Version 2 - config" \ @@ -52,7 +53,7 @@ license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL # # These dependencies can be removed once there is a mechanism in place -# to configure gss plugins, rather than delivering a fully populated +# to configure gss plugins, rather than delivering a fully populated # etc/gss/mech file. # depend fmri=service/security/kerberos-5 type=require diff --git a/usr/src/pkg/manifests/service-security-kerberos-5.mf b/usr/src/pkg/manifests/service-security-kerberos-5.mf index f898cb9219..ed41e7221a 100644 --- a/usr/src/pkg/manifests/service-security-kerberos-5.mf +++ b/usr/src/pkg/manifests/service-security-kerberos-5.mf @@ -20,18 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/security/kerberos-5@$(PKGVERS) set name=pkg.description value="Kerberos version 5 support" set name=pkg.summary value="Kerberos version 5 support" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/krb5 group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/security group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -48,15 +52,13 @@ dir path=var group=sys dir path=var/krb5 group=sys dir path=var/krb5/rcache group=sys mode=1777 dir path=var/krb5/rcache/root group=sys mode=0700 -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/security group=sys -file path=etc/krb5/krb5.conf group=sys original_name=SUNWkrb:etc/krb5/krb5.conf \ - preserve=true -file path=etc/krb5/warn.conf group=sys original_name=SUNWkrb:etc/krb5/warn.conf \ - preserve=true +file path=etc/krb5/krb5.conf group=sys \ + original_name=SUNWkrb:etc/krb5/krb5.conf preserve=true +file path=etc/krb5/warn.conf group=sys \ + original_name=SUNWkrb:etc/krb5/warn.conf preserve=true +file path=lib/svc/manifest/network/security/kadmin.xml group=sys mode=0444 +file path=lib/svc/manifest/network/security/krb5kdc.xml group=sys mode=0444 +file path=lib/svc/manifest/network/security/ktkt_warn.xml group=sys mode=0444 file path=usr/bin/kdestroy mode=0555 file path=usr/bin/kinit mode=0555 file path=usr/bin/klist mode=0555 @@ -76,9 +78,6 @@ file path=usr/lib/security/$(ARCH64)/pam_krb5.so.1 file path=usr/lib/security/$(ARCH64)/pam_krb5_migrate.so.1 file path=usr/lib/security/pam_krb5.so.1 file path=usr/lib/security/pam_krb5_migrate.so.1 -file path=lib/svc/manifest/network/security/kadmin.xml group=sys mode=0444 -file path=lib/svc/manifest/network/security/krb5kdc.xml group=sys mode=0444 -file path=lib/svc/manifest/network/security/ktkt_warn.xml group=sys mode=0444 legacy pkg=SUNWkrbr arch=$(ARCH) category=system \ desc="Kerberos version 5 support (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf index 449fa397fd..6b46cf5e72 100644 --- a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf +++ b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf @@ -20,24 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/service/storage/avs/cache-management@$(PKGVERS) set name=pkg.description \ value="Storage Cache Management of read-only bitmap volumes" -set name=pkg.summary value="Sun StorageTek Availability Suite Cache Management" +set name=pkg.summary \ + value="Sun StorageTek Availability Suite Cache Management" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=kernel group=sys @@ -45,6 +44,8 @@ dir path=kernel/kmdb group=sys dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -63,22 +64,21 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys -driver name=ncall devlink=type=ddi_pseudo;name=ncall\t\D perms="* 0666 root sys" \ - privs=sys_config privs=sys_devices -driver name=nsctl devlink=type=ddi_pseudo;name=nsctl\t\D perms="* 0666 root sys" \ - privs=sys_config privs=sys_devices +driver name=ncall devlink=type=ddi_pseudo;name=ncall\t\D \ + perms="* 0666 root sys" privs=sys_config privs=sys_devices +driver name=nsctl devlink=type=ddi_pseudo;name=nsctl\t\D \ + perms="* 0666 root sys" privs=sys_config privs=sys_devices driver name=nskern devlink=type=ddi_pseudo;name=nskern\t\D \ perms="* 0666 root sys" privs=sys_config privs=sys_devices driver name=sdbc devlink=type=ddi_pseudo;name=sdbc\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/dscfg_format group=sys mode=0744 file path=etc/init.d/scm mode=0744 -file path=kernel/kmdb/$(ARCH64)/nsctl group=sys mode=0555 reboot-needed=true -file path=kernel/kmdb/$(ARCH64)/sdbc group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/nsctl group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/sdbc group=sys mode=0555 reboot-needed=true +file path=kernel/kmdb/$(ARCH64)/nsctl group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/sdbc group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/nsctl group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/sdbc group=sys mode=0555 +file path=lib/svc/manifest/system/nws_scm.xml group=sys mode=0444 file path=usr/bin/dsbitmap mode=0555 file path=usr/bin/dscfg mode=0555 file path=usr/bin/dscfg_reconfigure.cluster mode=0555 @@ -110,7 +110,6 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/nsctl.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/sdbc.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/nsctl.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/sdbc.so group=sys mode=0555 -file path=lib/svc/manifest/system/nws_scm.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-scm target=../../../etc/init.d/scm hardlink path=usr/cluster/sbin/dscfg_reconfigure \ target=../../bin/dscfg_reconfigure.cluster diff --git a/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf b/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf index 0c9f2ff1a5..eceff9b37a 100644 --- a/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf +++ b/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf @@ -20,36 +20,32 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/service/storage/fibre-channel/fc-fabric@$(PKGVERS) +set name=pkg.fmri \ + value=pkg:/service/storage/fibre-channel/fc-fabric@$(PKGVERS) set name=pkg.description value="Provides the fp plug-in library of libcfgadm." set name=pkg.summary value="fp cfgadm plug-in library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system/device group=sys \ + variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/lib dir path=usr/lib/cfgadm dir path=usr/lib/cfgadm/$(ARCH64) -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system/device group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/fc-fabric mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \ + mode=0444 variant.opensolaris.zone=global +file path=lib/svc/method/fc-fabric mode=0555 variant.opensolaris.zone=global file path=usr/lib/cfgadm/$(ARCH64)/fp.so.1 file path=usr/lib/cfgadm/fp.so.1 -file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \ - mode=0444 opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWcfpl arch=$(ARCH) category=system \ desc="Provides the fp plug-in library of libcfgadm." \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-isns.mf b/usr/src/pkg/manifests/service-storage-isns.mf index 6384d766be..d199da2c69 100644 --- a/usr/src/pkg/manifests/service-storage-isns.mf +++ b/usr/src/pkg/manifests/service-storage-isns.mf @@ -20,26 +20,25 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/storage/isns@$(PKGVERS) set name=pkg.description \ value="Solaris internet Storage Name Service(iSNS) Server" set name=pkg.summary value="Solaris iSNS Server" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=usr group=sys -dir path=usr/sbin dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/network group=sys +dir path=usr group=sys +dir path=usr/sbin +file path=lib/svc/manifest/network/isns_server.xml group=sys mode=0444 file path=usr/sbin/isns mode=0555 file path=usr/sbin/isnsadm mode=0555 -file path=lib/svc/manifest/network/isns_server.xml group=sys mode=0444 legacy pkg=SUNWisns arch=$(ARCH) category=system \ desc="Solaris internet Storage Name Service(iSNS) Server" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf b/usr/src/pkg/manifests/service-storage-media-volume-manager.mf index 4a888ed722..2027cf5cd1 100644 --- a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf +++ b/usr/src/pkg/manifests/service-storage-media-volume-manager.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/storage/media-volume-manager@$(PKGVERS) @@ -29,29 +28,26 @@ set name=pkg.description value="Non-graphical removable volume manager" set name=pkg.summary value="Removable volume manager" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system/filesystem group=sys \ + variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/bin dir path=usr/lib dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system/filesystem group=sys opensolaris.zone=global \ +file path=lib/svc/manifest/system/filesystem/rmvolmgr.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-rmvolmgr mode=0555 opensolaris.zone=global \ +file path=lib/svc/method/svc-rmvolmgr mode=0555 \ variant.opensolaris.zone=global file path=usr/bin/rmformat mode=4555 file path=usr/bin/rmmount mode=0555 file path=usr/bin/volcheck mode=0555 file path=usr/bin/volrmmount mode=0555 file path=usr/lib/rmvolmgr mode=0555 -file path=lib/svc/manifest/system/filesystem/rmvolmgr.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWrmvolmgr arch=$(ARCH) category=system \ desc="Non-graphical removable volume manager" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.mf index 4eae1c646d..e8a768cc81 100644 --- a/usr/src/pkg/manifests/service-storage-ndmp.mf +++ b/usr/src/pkg/manifests/service-storage-ndmp.mf @@ -20,25 +20,26 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/service/storage/ndmp@$(PKGVERS) set name=pkg.description \ value="Network Data Management Protocol Service (user components)" set name=pkg.summary value="Network Data Management Protocol Service (User)" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/include @@ -46,8 +47,7 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/ndmp dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys +file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444 file path=lib/svc/method/svc-ndmp mode=0555 file path=usr/include/libndmp.h file path=usr/lib/$(ARCH64)/libndmp.so.1 @@ -58,7 +58,6 @@ file path=usr/lib/llib-lndmp.ln file path=usr/lib/ndmp/ndmpd mode=0555 file path=usr/sbin/ndmpadm mode=0555 file path=usr/sbin/ndmpstat mode=0555 -file path=lib/svc/manifest/system/ndmp.xml group=sys mode=0444 legacy pkg=SUNWndmpr arch=$(ARCH) category=system \ desc="Network Data Management Protocol Service (root components)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-removable-media.mf b/usr/src/pkg/manifests/service-storage-removable-media.mf index 140627261d..67f02d4590 100644 --- a/usr/src/pkg/manifests/service-storage-removable-media.mf +++ b/usr/src/pkg/manifests/service-storage-removable-media.mf @@ -29,17 +29,17 @@ set name=pkg.summary value="Storage media management library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=usr group=sys -dir path=usr/lib -dir path=usr/lib/$(ARCH64) -dir path=usr/lib/smedia -dir path=usr/lib/smedia/$(ARCH64) dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/network group=sys dir path=lib/svc/manifest/network/rpc group=sys +dir path=usr group=sys +dir path=usr/lib +dir path=usr/lib/$(ARCH64) +dir path=usr/lib/smedia +dir path=usr/lib/smedia/$(ARCH64) +file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444 file path=usr/lib/$(ARCH64)/libsmedia.so.1 file path=usr/lib/$(ARCH64)/llib-lsmedia.ln file path=usr/lib/libsmedia.so.1 @@ -54,7 +54,6 @@ file path=usr/lib/smedia/sm_blkdev.so.1 mode=0555 file path=usr/lib/smedia/sm_fd.so.1 mode=0555 file path=usr/lib/smedia/sm_pcata.so.1 mode=0555 file path=usr/lib/smedia/sm_scsi.so.1 mode=0555 -file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444 legacy pkg=SUNWsmedia arch=$(ARCH) category=system \ desc="Storage media management library" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/service-storage-virus-scan.mf b/usr/src/pkg/manifests/service-storage-virus-scan.mf index 1210c5e499..484f1cff76 100644 --- a/usr/src/pkg/manifests/service-storage-virus-scan.mf +++ b/usr/src/pkg/manifests/service-storage-virus-scan.mf @@ -20,45 +20,38 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/service/storage/virus-scan@$(PKGVERS) set name=pkg.description value="Virus Scan Service Kernel Root Components" set name=pkg.summary value="Virus Scan Service Kernel" -set name=info.classification value=org.opensolaris.category.2008:System/Services +set name=info.classification \ + value=org.opensolaris.category.2008:System/Services set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/filesystem group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/lib/vscan dir path=usr/sbin -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys -dir path=lib/svc/manifest/system/filesystem group=sys driver name=vscan perms="* 0640 root sys" -file path=kernel/drv/$(ARCH64)/vscan group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/vscan group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/vscan.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/vscan group=sys +$(i386_ONLY)file path=kernel/drv/vscan group=sys +file path=kernel/drv/vscan.conf group=sys +file path=lib/svc/manifest/system/filesystem/vscan.xml group=sys mode=0444 file path=usr/lib/devfsadm/linkmod/SUNW_vscan_link.so group=sys file path=usr/lib/vscan/libvscan.so.1 file path=usr/lib/vscan/vscand mode=0555 file path=usr/sbin/vscanadm mode=0555 -file path=lib/svc/manifest/system/filesystem/vscan.xml group=sys mode=0444 legacy pkg=SUNWvscankr arch=$(ARCH) category=system \ desc="Virus Scan Service Kernel Root Components" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/shell-ksh88.mf b/usr/src/pkg/manifests/shell-ksh88.mf index 525dc19cf9..29a080fbf5 100644 --- a/usr/src/pkg/manifests/shell-ksh88.mf +++ b/usr/src/pkg/manifests/shell-ksh88.mf @@ -28,7 +28,6 @@ set name=pkg.summary value=ksh88 set name=info.classification value=org.opensolaris.category.2008:System/Shells set name=org.opensolaris.redist value=nonredist set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/has dir path=usr/has/bin diff --git a/usr/src/pkg/manifests/source-demo-mdb-examples.mf b/usr/src/pkg/manifests/source-demo-mdb-examples.mf index f605a0d87c..93b1cf45ad 100644 --- a/usr/src/pkg/manifests/source-demo-mdb-examples.mf +++ b/usr/src/pkg/manifests/source-demo-mdb-examples.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/source/demo/mdb-examples@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Modular Debugger Demo Source" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/demo dir path=usr/demo/mdb diff --git a/usr/src/pkg/manifests/source-demo-system.mf b/usr/src/pkg/manifests/source-demo-system.mf index 55a7709e38..5d171a8759 100644 --- a/usr/src/pkg/manifests/source-demo-system.mf +++ b/usr/src/pkg/manifests/source-demo-system.mf @@ -29,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="OS demo source" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/demo dir path=usr/demo/ELF @@ -151,8 +150,8 @@ file path=usr/demo/ksh/tests/sun_solaris_builtin_poll.sh file path=usr/demo/ksh/tests/sun_solaris_builtin_sum.sh file path=usr/demo/ksh/tests/sun_solaris_builtin_tail.sh file path=usr/demo/ksh/tests/sun_solaris_command_substitution.sh -file path=usr/demo/ksh/tests/sun_solaris_compound_nameref.sh file path=usr/demo/ksh/tests/sun_solaris_compound_misc.sh +file path=usr/demo/ksh/tests/sun_solaris_compound_nameref.sh file path=usr/demo/ksh/tests/sun_solaris_compoundvario.sh file \ path=usr/demo/ksh/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh @@ -170,7 +169,8 @@ file \ file \ path=usr/demo/ksh/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh file path=usr/demo/ksh/tests/sun_solaris_cr_6778077_sigthaw_trap.sh -file path=usr/demo/ksh/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh +file \ + path=usr/demo/ksh/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh file \ path=usr/demo/ksh/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh file path=usr/demo/ksh/tests/sun_solaris_cr_6805792_varmovetest1.sh @@ -200,8 +200,8 @@ file \ path=usr/demo/ksh/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh file path=usr/demo/ksh/tests/sun_solaris_cr_xxxxxxxx_template.sh file path=usr/demo/ksh/tests/sun_solaris_getconf.sh -file path=usr/demo/ksh/tests/sun_solaris_locale_misc.sh file path=usr/demo/ksh/tests/sun_solaris_local_compound_nameref001.sh +file path=usr/demo/ksh/tests/sun_solaris_locale_misc.sh file path=usr/demo/ksh/tests/sun_solaris_staticvariables.sh file path=usr/demo/ksh/tests/sun_solaris_vartree001.sh file path=usr/demo/ksh/tests/sun_solaris_vartree002.sh @@ -282,8 +282,9 @@ file path=usr/demo/link_audit/src/who.h file path=usr/demo/link_audit/src/whocalls.ksh legacy pkg=SUNWosdem arch=$(ARCH) category=system \ desc="Source code to demonstrate the use of OS interfaces: ELF" \ - hotline="Please contact your local service provider" name="OS demo source" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="OS demo source" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lib/libshell/THIRDPARTYLICENSE license=lib/libshell/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/source-network-pppdump.mf b/usr/src/pkg/manifests/source-network-pppdump.mf index 0d1af07371..cca230c60a 100644 --- a/usr/src/pkg/manifests/source-network-pppdump.mf +++ b/usr/src/pkg/manifests/source-network-pppdump.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/source/network/pppdump@$(PKGVERS) set name=pkg.description \ value="Source for the optional GNU utilities for use with PPP" set name=pkg.summary value="Source for the GNU utilities for PPP" -set name=info.classification value=org.opensolaris.category.2008:Development/GNU +set name=info.classification \ + value=org.opensolaris.category.2008:Development/GNU set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/share group=sys dir path=usr/share/src group=sys @@ -58,8 +57,8 @@ file path=usr/share/src/ppputil/pppdump/zlib.h legacy pkg=SUNWpppgS arch=$(ARCH) category=system \ desc="Source for the optional GNU utilities for use with PPP" \ hotline="Please contact your local service provider" \ - name="Source for the GNU utilities for PPP" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Source for the GNU utilities for PPP" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \ license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect license cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \ diff --git a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf index 8ee5c4e21e..7819d3a46b 100644 --- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf +++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -32,7 +31,6 @@ set name=pkg.summary \ value="tcpd - access control facility for internet services (Source)" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/share group=sys dir path=usr/share/src group=sys diff --git a/usr/src/pkg/manifests/source-system-grub.mf b/usr/src/pkg/manifests/source-system-grub.mf index cd7d2d8b9b..5f961a0ff0 100644 --- a/usr/src/pkg/manifests/source-system-grub.mf +++ b/usr/src/pkg/manifests/source-system-grub.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/source/system/grub@0.97,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.description value="Source for GNU GRUB" -set name=pkg.summary value="Source for GNU GRUB - GNU GRand Unified Bootloader" +set name=pkg.summary \ + value="Source for GNU GRUB - GNU GRand Unified Bootloader" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/share group=sys dir path=usr/share/src group=sys diff --git a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf index 67e7144cc1..325889e3ab 100644 --- a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf +++ b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/storage/avs/point-in-time-copy@$(PKGVERS) set name=pkg.description value="Point-In-Time Copy and snapshot facility" set name=pkg.summary \ @@ -37,7 +36,6 @@ set name=pkg.summary \ set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=kernel group=sys @@ -45,6 +43,8 @@ dir path=kernel/kmdb group=sys dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -62,14 +62,13 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys driver name=ii devlink=type=ddi_pseudo;name=ii\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/init.d/ii mode=0744 file path=etc/init.d/ii.cluster mode=0744 -file path=kernel/kmdb/$(ARCH64)/ii group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/ii group=sys mode=0555 reboot-needed=true +file path=kernel/kmdb/$(ARCH64)/ii group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/ii group=sys mode=0555 +file path=lib/svc/manifest/system/nws_ii.xml group=sys mode=0444 file path=usr/bin/iiadm mode=0555 file path=usr/bin/iiboot mode=0555 file path=usr/bin/iicpbmp mode=0555 @@ -81,7 +80,6 @@ file path=usr/kernel/drv/ii.conf group=sys \ original_name=SUNWii:usr/kernel/drv/ii.conf preserve=true file path=usr/lib/mdb/kvm/$(ARCH64)/ii.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/ii.so group=sys mode=0555 -file path=lib/svc/manifest/system/nws_ii.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-ii target=../../../etc/init.d/ii legacy pkg=SUNWiir arch=$(ARCH) category=system \ desc="Point-In-Time Copy and snapshot facility" \ diff --git a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf index d7f11d0f2b..a84618bd70 100644 --- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf +++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/storage/avs/remote-mirror@$(PKGVERS) set name=pkg.description \ value="Remote Mirror copy software provides replication across IP networks" set name=pkg.summary value="Sun StorageTek Availability Suite Remote Mirror" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=kernel group=sys @@ -44,6 +43,8 @@ dir path=kernel/kmdb group=sys dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -63,15 +64,15 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys driver name=rdc devlink=type=ddi_pseudo;name=rdc\t\D perms="* 0666 root sys" \ privs=sys_config privs=sys_devices file path=etc/init.d/rdc mode=0744 file path=etc/init.d/rdc.cluster mode=0744 file path=etc/init.d/rdcfinish mode=0744 -file path=kernel/kmdb/$(ARCH64)/rdc group=sys mode=0555 reboot-needed=true -$(i386_ONLY)file path=kernel/kmdb/rdc group=sys mode=0555 reboot-needed=true +file path=kernel/kmdb/$(ARCH64)/rdc group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/rdc group=sys mode=0555 +file path=lib/svc/manifest/system/nws_rdc.xml group=sys mode=0444 +file path=lib/svc/manifest/system/nws_rdcsyncd.xml group=sys mode=0444 file path=usr/bin/sndradm mode=0555 file path=usr/bin/sndrboot mode=0555 file path=usr/bin/sndrd mode=0555 @@ -88,11 +89,10 @@ $(i386_ONLY)file path=usr/kernel/drv/rdcstub group=sys file path=usr/lib/librdc.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/rdc.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/rdc.so group=sys mode=0555 -file path=lib/svc/manifest/system/nws_rdc.xml group=sys mode=0444 -file path=lib/svc/manifest/system/nws_rdcsyncd.xml group=sys mode=0444 hardlink path=lib/svc/method/svc-rdc target=../../../etc/init.d/rdc hardlink path=lib/svc/method/svc-rdcsyncd target=../../../etc/init.d/rdcfinish -hardlink path=usr/kernel/misc/$(ARCH64)/rdcsrv target=../../drv/$(ARCH64)/rdcsrv +hardlink path=usr/kernel/misc/$(ARCH64)/rdcsrv \ + target=../../drv/$(ARCH64)/rdcsrv hardlink path=usr/kernel/misc/$(ARCH64)/rdcstub \ target=../../drv/$(ARCH64)/rdcstub $(i386_ONLY)hardlink path=usr/kernel/misc/rdcsrv target=../drv/rdcsrv diff --git a/usr/src/pkg/manifests/storage-avs.mf b/usr/src/pkg/manifests/storage-avs.mf index c3a35edc54..b8a0ecf915 100644 --- a/usr/src/pkg/manifests/storage-avs.mf +++ b/usr/src/pkg/manifests/storage-avs.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/storage/avs@0.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.summary value="Availability Suite" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=driver/storage/sv type=require depend fmri=service/storage/avs/cache-management type=require depend fmri=storage/avs/point-in-time-copy type=require diff --git a/usr/src/pkg/manifests/storage-library-network-array.mf b/usr/src/pkg/manifests/storage-library-network-array.mf index cfece09306..039955ef92 100644 --- a/usr/src/pkg/manifests/storage-library-network-array.mf +++ b/usr/src/pkg/manifests/storage-library-network-array.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/storage/library/network-array@$(PKGVERS) set name=pkg.description value="Sun Enterprise Network Array libraries" set name=pkg.summary value="Sun Enterprise Network Array libraries" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/$(ARCH64) file path=lib/$(ARCH64)/liba5k.so.2 diff --git a/usr/src/pkg/manifests/storage-metassist.mf b/usr/src/pkg/manifests/storage-metassist.mf index 67f416af56..d489946fda 100644 --- a/usr/src/pkg/manifests/storage-metassist.mf +++ b/usr/src/pkg/manifests/storage-metassist.mf @@ -20,19 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/storage/metassist@$(PKGVERS) set name=pkg.description value="Solaris Volume Manager Assistant" set name=pkg.summary value="Solaris Volume Manager Assistant" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/default group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/default group=sys dir path=usr group=sys dir path=usr/sbin dir path=usr/share group=sys @@ -40,8 +43,7 @@ dir path=usr/share/lib group=sys dir path=usr/share/lib/xml group=sys dir path=usr/share/lib/xml/dtd group=sys dir path=usr/share/lib/xml/style group=sys -file path=etc/default/metassist.xml group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=etc/default/metassist.xml group=sys file path=usr/sbin/metassist mode=0555 file path=usr/share/lib/xml/dtd/volume-config.dtd group=sys file path=usr/share/lib/xml/dtd/volume-defaults.dtd group=sys diff --git a/usr/src/pkg/manifests/storage-mpathadm.mf b/usr/src/pkg/manifests/storage-mpathadm.mf index dc527071f9..972cc27863 100644 --- a/usr/src/pkg/manifests/storage-mpathadm.mf +++ b/usr/src/pkg/manifests/storage-mpathadm.mf @@ -20,10 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/storage/mpathadm@$(PKGVERS) set name=pkg.description \ value="Path Administration Utility for a Solaris Multipathing device" @@ -31,7 +36,6 @@ set name=pkg.summary value="Solaris Multipathing CLI" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sbin file path=usr/sbin/mpathadm mode=0555 diff --git a/usr/src/pkg/manifests/storage-nas.mf b/usr/src/pkg/manifests/storage-nas.mf index 1f68e6f829..17b390f8df 100644 --- a/usr/src/pkg/manifests/storage-nas.mf +++ b/usr/src/pkg/manifests/storage-nas.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/storage-nas@0.1,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=storage/storage-nas type=require diff --git a/usr/src/pkg/manifests/storage-server.mf b/usr/src/pkg/manifests/storage-server.mf index 4b49f97dce..d9acbf3cef 100644 --- a/usr/src/pkg/manifests/storage-server.mf +++ b/usr/src/pkg/manifests/storage-server.mf @@ -20,12 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/storage-server@0.1,5.11-0.133 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=storage/storage-server type=require diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.mf index d93c39af1b..d44f0d0aa6 100644 --- a/usr/src/pkg/manifests/storage-stmf.mf +++ b/usr/src/pkg/manifests/storage-stmf.mf @@ -27,22 +27,19 @@ set name=pkg.fmri value=pkg:/storage/stmf@$(PKGVERS) set name=pkg.description \ value="Sun Common Multiprotocol SCSI Target device drivers" set name=pkg.summary value="Sun Common Multiprotocol SCSI Target" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/kmdb group=sys +dir path=kernel/kmdb/$(ARCH64) group=sys +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/demo dir path=usr/demo/comstar @@ -55,55 +52,33 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=fct perms="* 0666 root sys" driver name=pppt perms="* 0666 root sys" driver name=qlt perms="* 0666 root sys" driver name=stmf perms="* 0666 root sys" driver name=stmf_sbd perms="* 0666 root sys" -file path=kernel/drv/$(ARCH64)/fct group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/pppt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/qlt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/stmf group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/stmf_sbd group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/fct group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/fct.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/pppt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/pppt.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/qlt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/qlt.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/stmf group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/stmf.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/stmf_sbd group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/stmf_sbd.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/stmf group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/stmf group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/stmf_sbd group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/stmf_sbd group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=lib/svc/method/svc-stmf mode=0555 opensolaris.zone=global \ +file path=kernel/drv/$(ARCH64)/fct group=sys +file path=kernel/drv/$(ARCH64)/pppt group=sys +file path=kernel/drv/$(ARCH64)/qlt group=sys +file path=kernel/drv/$(ARCH64)/stmf group=sys +file path=kernel/drv/$(ARCH64)/stmf_sbd group=sys +$(i386_ONLY)file path=kernel/drv/fct group=sys +file path=kernel/drv/fct.conf group=sys +$(i386_ONLY)file path=kernel/drv/pppt group=sys +file path=kernel/drv/pppt.conf group=sys +$(i386_ONLY)file path=kernel/drv/qlt group=sys +file path=kernel/drv/qlt.conf group=sys +$(i386_ONLY)file path=kernel/drv/stmf group=sys +file path=kernel/drv/stmf.conf group=sys +$(i386_ONLY)file path=kernel/drv/stmf_sbd group=sys +file path=kernel/drv/stmf_sbd.conf group=sys +file path=kernel/kmdb/$(ARCH64)/stmf group=sys mode=0555 +file path=kernel/kmdb/$(ARCH64)/stmf_sbd group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/stmf group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/stmf_sbd group=sys mode=0555 +file path=lib/svc/manifest/system/stmf.xml group=sys mode=0444 \ variant.opensolaris.zone=global +file path=lib/svc/method/svc-stmf mode=0555 variant.opensolaris.zone=global file path=usr/demo/comstar/bin/aluaadm mode=0555 file path=usr/demo/comstar/bin/svc-stmfproxy mode=0555 file path=usr/demo/comstar/stmfproxy.xml mode=0444 @@ -125,18 +100,16 @@ file path=usr/lib/libstmfproxy.so.1 file path=usr/lib/llib-lstmf file path=usr/lib/llib-lstmf.ln file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/stmf.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/stmf_sbd.so group=sys mode=0555 +$(i386_ONLY)file path=usr/lib/mdb/kvm/stmf.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/stmf_sbd.so group=sys mode=0555 file path=usr/sbin/sbdadm mode=0555 file path=usr/sbin/stmfadm mode=0555 -file path=lib/svc/manifest/system/stmf.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWstmf arch=$(ARCH) category=system \ desc="Sun Common Multiprotocol SCSI Target device drivers" \ hotline="Please contact your local service provider" \ - name="Sun Common Multiprotocol SCSI Target" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun Common Multiprotocol SCSI Target" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 legacy pkg=SUNWstmfu arch=$(ARCH) category=system \ desc="Sun Common Multiprotocol SCSI Target Libraries and Tools" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/storage-storage-nas.mf b/usr/src/pkg/manifests/storage-storage-nas.mf index a0b9fead2a..3e5a17e931 100644 --- a/usr/src/pkg/manifests/storage-storage-nas.mf +++ b/usr/src/pkg/manifests/storage-storage-nas.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/storage/storage-nas@0.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.summary value="Network Attached Storage cluster" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=network/iscsi/initiator type=require depend fmri=service/file-system/nfs type=require depend fmri=service/file-system/smb type=require diff --git a/usr/src/pkg/manifests/storage-storage-server.mf b/usr/src/pkg/manifests/storage-storage-server.mf index a754e64cb0..fe44b6a163 100644 --- a/usr/src/pkg/manifests/storage-storage-server.mf +++ b/usr/src/pkg/manifests/storage-storage-server.mf @@ -24,9 +24,9 @@ set name=pkg.fmri \ value=pkg:/storage/storage-server@0.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.summary value="Multi Protocol Storage Server cluster" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=benchmark/filebench type=require depend fmri=developer/debug/mdb/module/module-fibre-channel type=require depend fmri=developer/debug/mdb/module/module-qlc type=require diff --git a/usr/src/pkg/manifests/storage-svm.mf b/usr/src/pkg/manifests/storage-svm.mf index 82568b62c4..bc7a4915ed 100644 --- a/usr/src/pkg/manifests/storage-svm.mf +++ b/usr/src/pkg/manifests/storage-svm.mf @@ -20,39 +20,38 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/storage/svm@$(PKGVERS) set name=pkg.description value="Solaris Volume Manager commands" set name=pkg.summary value="Solaris Volume Manager" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/flash group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/flash/postdeployment group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/flash/predeployment group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/lvm group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global -dir path=sbin group=sys opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/flash group=sys +dir path=etc/flash/postdeployment group=sys +dir path=etc/flash/predeployment group=sys +dir path=etc/lvm group=sys +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/misc group=sys +dir path=kernel/misc/$(ARCH64) group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/rpc group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/method +dir path=sbin group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/drv @@ -60,94 +59,58 @@ dir path=usr/lib/lvm dir path=usr/sbin dir path=usr/snadm dir path=usr/snadm/lib -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network/rpc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -driver name=md policy="admin write_priv_set=sys_config" perms="* 0640 root sys" \ - perms="admin 0644 root sys" -file path=etc/flash/postdeployment/svm.cleanup group=sys mode=0744 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/flash/predeployment/svm.save group=sys mode=0744 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/lvm/devpath group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/devpath preserve=true \ - variant.opensolaris.zone=global -file path=etc/lvm/lock group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/lock preserve=true \ - variant.opensolaris.zone=global -file path=etc/lvm/md.cf group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/md.cf preserve=true \ - variant.opensolaris.zone=global -file path=etc/lvm/md.ctlrmap group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/md.ctlrmap preserve=true \ - variant.opensolaris.zone=global -file path=etc/lvm/md.tab group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/md.tab preserve=true \ - variant.opensolaris.zone=global -file path=etc/lvm/mddb.cf group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/mddb.cf preserve=true \ - variant.opensolaris.zone=global -file path=etc/lvm/runtime.cf group=sys opensolaris.zone=global \ - original_name=SUNWmd:etc/lvm/runtime.cf preserve=true \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/md group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/md group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/md.conf group=sys opensolaris.zone=global \ - original_name=SUNWmd:kernel/drv/md.conf preserve=true reboot-needed=false \ - variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_hotspares group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_mirror group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_notify group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_raid group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_sp group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_stripe group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/md_trans group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_hotspares group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_mirror group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_notify group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_raid group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_sp group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_stripe group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/md_trans group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=lib/libmeta.so.1 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-mdmonitor mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-metainit mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-metasync mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=sbin/metadb mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=sbin/metadevadm mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=sbin/metainit mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=sbin/metarecover mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=sbin/metastat mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global +driver name=md policy="admin write_priv_set=sys_config" \ + perms="* 0640 root sys" perms="admin 0644 root sys" +file path=etc/flash/postdeployment/svm.cleanup group=sys mode=0744 +file path=etc/flash/predeployment/svm.save group=sys mode=0744 +file path=etc/lvm/devpath group=sys original_name=SUNWmd:etc/lvm/devpath \ + preserve=true +file path=etc/lvm/lock group=sys original_name=SUNWmd:etc/lvm/lock \ + preserve=true +file path=etc/lvm/md.cf group=sys original_name=SUNWmd:etc/lvm/md.cf \ + preserve=true +file path=etc/lvm/md.ctlrmap group=sys original_name=SUNWmd:etc/lvm/md.ctlrmap \ + preserve=true +file path=etc/lvm/md.tab group=sys original_name=SUNWmd:etc/lvm/md.tab \ + preserve=true +file path=etc/lvm/mddb.cf group=sys original_name=SUNWmd:etc/lvm/mddb.cf \ + preserve=true +file path=etc/lvm/runtime.cf group=sys original_name=SUNWmd:etc/lvm/runtime.cf \ + preserve=true +file path=kernel/drv/$(ARCH64)/md group=sys +$(i386_ONLY)file path=kernel/drv/md group=sys +file path=kernel/drv/md.conf group=sys original_name=SUNWmd:kernel/drv/md.conf \ + preserve=true +file path=kernel/misc/$(ARCH64)/md_hotspares group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/md_mirror group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/md_notify group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/md_raid group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/md_sp group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/md_stripe group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/md_trans group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_hotspares group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_mirror group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_notify group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_raid group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_sp group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_stripe group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/md_trans group=sys mode=0755 +file path=lib/libmeta.so.1 +file path=lib/svc/manifest/network/rpc/mdcomm.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/meta.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/metamed.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/metamh.xml group=sys mode=0444 +file path=lib/svc/manifest/system/mdmonitor.xml group=sys mode=0444 +file path=lib/svc/manifest/system/metainit.xml group=sys mode=0444 +file path=lib/svc/manifest/system/metasync.xml group=sys mode=0444 +file path=lib/svc/method/svc-mdmonitor mode=0555 +file path=lib/svc/method/svc-metainit mode=0555 +file path=lib/svc/method/svc-metasync mode=0555 +file path=sbin/metadb mode=0555 +file path=sbin/metadevadm mode=0555 +file path=sbin/metainit mode=0555 +file path=sbin/metarecover mode=0555 +file path=sbin/metastat mode=0555 file path=usr/lib/drv/preen_md.so.1 mode=0555 file path=usr/lib/lvm/mddoors mode=0555 file path=usr/lib/lvm/metaclust mode=0555 @@ -172,20 +135,6 @@ file path=usr/sbin/rpc.metad mode=0555 file path=usr/sbin/rpc.metamedd mode=0555 file path=usr/sbin/rpc.metamhd mode=0555 file path=usr/snadm/lib/libsvm.so.1 -file path=lib/svc/manifest/network/rpc/mdcomm.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/network/rpc/meta.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/network/rpc/metamed.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/network/rpc/metamh.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/mdmonitor.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/metainit.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/metasync.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWmdr arch=$(ARCH) category=system \ desc="Solaris Volume Manager driver" \ hotline="Please contact your local service provider" \ @@ -198,8 +147,7 @@ legacy pkg=SUNWmdu arch=$(ARCH) category=system \ version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=lib/libmeta.so opensolaris.zone=global target=libmeta.so.1 \ - variant.opensolaris.zone=global +link path=lib/libmeta.so target=libmeta.so.1 link path=usr/lib/libmeta.so target=../../lib/libmeta.so.1 link path=usr/lib/libmeta.so.1 target=../../lib/libmeta.so.1 link path=usr/sbin/metadb target=../../sbin/metadb diff --git a/usr/src/pkg/manifests/system-accounting-legacy.mf b/usr/src/pkg/manifests/system-accounting-legacy.mf index 17bac3687a..01f3197ad6 100644 --- a/usr/src/pkg/manifests/system-accounting-legacy.mf +++ b/usr/src/pkg/manifests/system-accounting-legacy.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/accounting/legacy@$(PKGVERS) @@ -31,12 +30,13 @@ set name=pkg.summary value="System Accounting" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/acct group=adm owner=adm dir path=etc/init.d group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -54,12 +54,11 @@ dir path=var/adm/sa group=sys mode=0775 owner=adm dir path=var/spool dir path=var/spool/cron group=sys dir path=var/spool/cron/crontabs group=sys -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys file path=etc/acct/holidays original_name=SUNWacc:etc/acct/holidays \ preserve=true file path=etc/init.d/acct group=sys mode=0744 \ original_name=SUNWacc:etc/init.d/acct preserve=true +file path=lib/svc/manifest/system/sar.xml group=sys mode=0444 file path=lib/svc/method/svc-sar group=sys mode=0555 file path=usr/bin/acctcom mode=0555 file path=usr/bin/timex group=sys mode=0555 @@ -101,7 +100,6 @@ file path=usr/lib/sa/sadc mode=0555 file path=usr/sbin/sar mode=0555 file path=var/spool/cron/crontabs/sys group=sys mode=0600 \ original_name=SUNWacc:var/spool/cron/crontabs/sys preserve=true -file path=lib/svc/manifest/system/sar.xml group=sys mode=0444 legacy pkg=SUNWaccr arch=$(ARCH) category=system \ desc="utilities for accounting and reporting of system activity" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-boot-grub.mf b/usr/src/pkg/manifests/system-boot-grub.mf index 119f846c7b..1de2c772ac 100644 --- a/usr/src/pkg/manifests/system-boot-grub.mf +++ b/usr/src/pkg/manifests/system-boot-grub.mf @@ -20,73 +20,53 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/boot/grub@0.97,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) $(sparc_ONLY)set name=pkg.description value="GRUB libraries" $(i386_ONLY)set name=pkg.description value="Multiboot Boot Loader" -$(i386_ONLY)set name=pkg.summary value="GNU GRUB - GNU GRand Unified Bootloader" +$(i386_ONLY)set name=pkg.summary \ + value="GNU GRUB - GNU GRand Unified Bootloader" $(sparc_ONLY)set name=pkg.summary value=GRUB set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -$(i386_ONLY)dir path=boot group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=boot/grub group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=boot/grub/bin group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +$(i386_ONLY)dir path=boot group=sys +$(i386_ONLY)dir path=boot/grub group=sys +$(i386_ONLY)dir path=boot/grub/bin group=sys dir path=lib -$(i386_ONLY)file path=boot/grub/bin/grub group=sys mode=0555 \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/capability group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global +$(i386_ONLY)file path=boot/grub/bin/grub group=sys mode=0555 +$(i386_ONLY)file path=boot/grub/capability group=sys mode=0444 $(i386_ONLY)file path=boot/grub/default group=sys mode=0444 \ - opensolaris.zone=global original_name=SUNWgrub:boot/grub/default \ - preserve=true variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/e2fs_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/fat_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/ffs_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/install_menu group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/iso9660_stage1_5 group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/jfs_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/menu.lst group=sys opensolaris.zone=global \ - original_name=SUNWgrub:boot/grub/menu.lst preserve=true \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/minix_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/nbgrub group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/pxegrub group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/reiserfs_stage1_5 group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global + original_name=SUNWgrub:boot/grub/default preserve=true +$(i386_ONLY)file path=boot/grub/e2fs_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/fat_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/ffs_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/install_menu group=sys +$(i386_ONLY)file path=boot/grub/iso9660_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/jfs_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/menu.lst group=sys \ + original_name=SUNWgrub:boot/grub/menu.lst preserve=true +$(i386_ONLY)file path=boot/grub/minix_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/nbgrub group=sys +$(i386_ONLY)file path=boot/grub/pxegrub group=sys +$(i386_ONLY)file path=boot/grub/reiserfs_stage1_5 group=sys $(i386_ONLY)file path=boot/grub/splash.xpm.gz group=sys -$(i386_ONLY)file path=boot/grub/stage1 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/stage2 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/stage2_eltorito group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/ufs2_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/ufs_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/vstafs_stage1_5 group=sys \ - opensolaris.zone=global variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/xfs_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=boot/grub/zfs_stage1_5 group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +$(i386_ONLY)file path=boot/grub/stage1 group=sys +$(i386_ONLY)file path=boot/grub/stage2 group=sys +$(i386_ONLY)file path=boot/grub/stage2_eltorito group=sys +$(i386_ONLY)file path=boot/grub/ufs2_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/ufs_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/vstafs_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/xfs_stage1_5 group=sys +$(i386_ONLY)file path=boot/grub/zfs_stage1_5 group=sys file path=lib/libgrubmgmt.so.1 file path=lib/llib-lgrubmgmt file path=lib/llib-lgrubmgmt.ln diff --git a/usr/src/pkg/manifests/system-boot-network.mf b/usr/src/pkg/manifests/system-boot-network.mf index 6fb6a69789..a52c9dd37d 100644 --- a/usr/src/pkg/manifests/system-boot-network.mf +++ b/usr/src/pkg/manifests/system-boot-network.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/boot/network@$(PKGVERS) @@ -29,24 +28,24 @@ set name=pkg.description value="Boot Server daemons" set name=pkg.summary value="Boot Server daemons" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=usr group=sys -dir path=usr/sbin dir path=lib dir path=lib/svc dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/network group=sys dir path=lib/svc/manifest/network/rpc group=sys -file path=usr/sbin/in.rarpd mode=0555 -file path=usr/sbin/rpc.bootparamd mode=0555 +dir path=usr group=sys +dir path=usr/sbin file path=lib/svc/manifest/network/rarp.xml group=sys mode=0444 file path=lib/svc/manifest/network/rpc/bootparams.xml group=sys mode=0444 +file path=usr/sbin/in.rarpd mode=0555 +file path=usr/sbin/rpc.bootparamd mode=0555 legacy pkg=SUNWbsr arch=$(ARCH) category=system \ desc="Boot Server daemons (Root)" \ hotline="Please contact your local service provider" \ name="Boot Server daemons (Root)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 -legacy pkg=SUNWbsu arch=$(ARCH) category=system desc="Boot Server daemons (Usr)" \ +legacy pkg=SUNWbsu arch=$(ARCH) category=system \ + desc="Boot Server daemons (Usr)" \ hotline="Please contact your local service provider" \ name="Boot Server daemons (Usr)" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/system-boot-real-mode.mf b/usr/src/pkg/manifests/system-boot-real-mode.mf index 3c46b50806..a8fc0cd8de 100644 --- a/usr/src/pkg/manifests/system-boot-real-mode.mf +++ b/usr/src/pkg/manifests/system-boot-real-mode.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/boot/real-mode@$(PKGVERS) @@ -33,21 +32,16 @@ set name=info.classification value=org.opensolaris.category.2008:System/Core # another, so SUNWrmod continues to be delivered as sparc, but # empty to satisfy the rename. set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -$(i386_ONLY)dir path=boot group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=boot/solaris group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)dir path=boot/solaris/devicedb group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +$(i386_ONLY)dir path=boot group=sys +$(i386_ONLY)dir path=boot/solaris group=sys +$(i386_ONLY)dir path=boot/solaris/devicedb group=sys $(i386_ONLY)dir path=usr group=sys $(i386_ONLY)dir path=usr/lib $(i386_ONLY)dir path=usr/lib/fs group=sys $(i386_ONLY)dir path=usr/lib/fs/ufs group=sys $(i386_ONLY)file path=boot/solaris.xpm group=sys -$(i386_ONLY)file path=boot/solaris/bootenv.rc group=sys opensolaris.zone=global \ - original_name=SUNWrmodr:boot/solaris/bootenv.rc preserve=true \ - variant.opensolaris.zone=global +$(i386_ONLY)file path=boot/solaris/bootenv.rc group=sys \ + original_name=SUNWrmodr:boot/solaris/bootenv.rc preserve=true $(i386_ONLY)file path=boot/solaris/devicedb/master group=sys \ original_name=SUNWrmod:boot/solaris/devicedb/master preserve=true $(i386_ONLY)file path=usr/lib/fs/ufs/mboot mode=0444 diff --git a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf b/usr/src/pkg/manifests/system-boot-wanboot-internal.mf index 3b3ceb79af..0a186d8906 100644 --- a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf +++ b/usr/src/pkg/manifests/system-boot-wanboot-internal.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/boot/wanboot/internal@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="Solaris WAN boot internal" set name=pkg.summary value="WAN boot internal" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-boot-wanboot.mf b/usr/src/pkg/manifests/system-boot-wanboot.mf index 095aabb655..52ca1372fa 100644 --- a/usr/src/pkg/manifests/system-boot-wanboot.mf +++ b/usr/src/pkg/manifests/system-boot-wanboot.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/boot/wanboot@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="Solaris WAN boot support" set name=pkg.summary value="WAN boot support" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/abi diff --git a/usr/src/pkg/manifests/system-compatibility-sunos4.mf b/usr/src/pkg/manifests/system-compatibility-sunos4.mf index c5685697ec..450fe64362 100644 --- a/usr/src/pkg/manifests/system-compatibility-sunos4.mf +++ b/usr/src/pkg/manifests/system-compatibility-sunos4.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/compatibility/sunos4@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="SunOS 4.x Binary Compatibility" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/4lib file path=usr/4lib/libc.so.1.9 diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.mf b/usr/src/pkg/manifests/system-data-hardware-registry.mf index a3f46da442..9391395d29 100644 --- a/usr/src/pkg/manifests/system-data-hardware-registry.mf +++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/data/hardware-registry@$(PKGVERS) set name=pkg.description \ value="ASCII databases describing various PCI, USB and other hardware" set name=pkg.summary value="Hardware data files" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/share group=sys dir path=usr/share/hwdata group=sys diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf index 17b5e1a08c..cf86e8fdd6 100644 --- a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf +++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/data/keyboard/keytables@$(PKGVERS) set name=pkg.description \ value="Configuration tables that specify keyboard attributes such as localized meanings for individual keys" set name=pkg.summary value="Keyboard configuration tables" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/share group=sys @@ -125,8 +124,8 @@ $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us101a_pc $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us_5 $(sparc_ONLY)file path=usr/share/lib/keytables/type_4/us_hobo -file path=usr/share/lib/keytables/type_6/arabia file path=usr/share/lib/keytables/type_6/albania +file path=usr/share/lib/keytables/type_6/arabia file path=usr/share/lib/keytables/type_6/belarus file path=usr/share/lib/keytables/type_6/belgium file path=usr/share/lib/keytables/type_6/brazil diff --git a/usr/src/pkg/manifests/system-data-terminfo.mf b/usr/src/pkg/manifests/system-data-terminfo.mf index 116b2d9d0d..5d420d982b 100644 --- a/usr/src/pkg/manifests/system-data-terminfo.mf +++ b/usr/src/pkg/manifests/system-data-terminfo.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/data/terminfo@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Terminal Information" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/share group=sys diff --git a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf index 0d7c33a7dc..c61f2f8cfe 100644 --- a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf +++ b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf @@ -20,47 +20,44 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/domain-configuration/sparc-enterprise@$(PKGVERS) set name=pkg.description value="Domain Configuration Server" set name=pkg.summary value="Domain Configuration Server" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4u group=sys +dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib dir path=usr/platform group=sys dir path=usr/platform/SUNW,SPARC-Enterprise group=sys dir path=usr/platform/SUNW,SPARC-Enterprise/lib dir path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64) -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-dcs mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-oplhpd mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=lib/svc/manifest/platform/sun4u/dcs.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4u/oplhpd.xml group=sys mode=0444 +file path=lib/svc/method/svc-dcs mode=0555 +file path=lib/svc/method/svc-oplhpd mode=0555 file path=usr/lib/dcs mode=0755 file path=usr/platform/SUNW,SPARC-Enterprise/lib/$(ARCH64)/oplhpd mode=0755 -file path=lib/svc/manifest/platform/sun4u/dcs.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/platform/sun4u/oplhpd.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWdcsr arch=$(ARCH) category=system \ desc="Domain Configuration Server, (Root)" \ hotline="Please contact your local service provider" \ - name="Domain Configuration Server, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Domain Configuration Server, (Root)" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 legacy pkg=SUNWdcsu arch=$(ARCH) category=system \ desc="Domain Configuration Server" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf index 58a57a33b3..10d27e4f83 100644 --- a/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf +++ b/usr/src/pkg/manifests/system-domain-service-processor-protocol-sparc-enterprise.mf @@ -20,26 +20,28 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/domain-service-processor-protocol/sparc-enterprise@$(PKGVERS) set name=pkg.description \ value="Domain to Service Processor Communications Protocol" -set name=pkg.summary value="Domain to Service Processor Communications Protocol" +set name=pkg.summary \ + value="Domain to Service Processor Communications Protocol" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4u group=sys dir path=lib/svc/method dir path=platform group=sys dir path=platform/SUNW,SPARC-Enterprise group=sys @@ -51,24 +53,20 @@ dir path=usr/platform group=sys dir path=usr/platform/SUNW,SPARC-Enterprise group=sys dir path=usr/platform/SUNW,SPARC-Enterprise/lib dir path=usr/platform/SUNW,SPARC-Enterprise/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/platform group=sys -dir path=lib/svc/manifest/platform/sun4u group=sys driver name=dm2s driver name=oplkmdrv +file path=lib/svc/manifest/platform/sun4u/dscp.xml group=sys mode=0444 file path=lib/svc/method/svc-dscp mode=0555 file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/dm2s group=sys -file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplkmdrv group=sys -file path=platform/SUNW,SPARC-Enterprise/kernel/drv/dm2s.conf group=sys \ - reboot-needed=false -file path=platform/SUNW,SPARC-Enterprise/kernel/drv/oplkmdrv.conf group=sys \ - reboot-needed=false +file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplkmdrv \ + group=sys +file path=platform/SUNW,SPARC-Enterprise/kernel/drv/dm2s.conf group=sys +file path=platform/SUNW,SPARC-Enterprise/kernel/drv/oplkmdrv.conf group=sys file path=usr/platform/SUNW,SPARC-Enterprise/lib/dscp.ppp.options group=sys \ mode=0555 file path=usr/platform/SUNW,SPARC-Enterprise/lib/libdscp.so.1 file path=usr/platform/SUNW,SPARC-Enterprise/lib/llib-ldscp.ln group=sys file path=usr/platform/SUNW,SPARC-Enterprise/sbin/prtdscp mode=0755 -file path=lib/svc/manifest/platform/sun4u/dscp.xml group=sys mode=0444 legacy pkg=SUNWdscpr.u arch=$(ARCH).sun4u category=system \ desc="Domain to Service Processor Communications Protocol (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-dtrace-tests.mf b/usr/src/pkg/manifests/system-dtrace-tests.mf index 4c8cb58a13..e7d5bfd3da 100644 --- a/usr/src/pkg/manifests/system-dtrace-tests.mf +++ b/usr/src/pkg/manifests/system-dtrace-tests.mf @@ -29,7 +29,6 @@ set name=pkg.summary value="DTrace Test Suite" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=opt/SUNWdtrt group=sys dir path=opt/SUNWdtrt/bin dir path=opt/SUNWdtrt/bin/$(ARCH32) @@ -134,13 +133,15 @@ file path=opt/SUNWdtrt/tst/$(ARCH)/arrays/tst.uregsarray.d mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyin.d mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyinstr.d \ mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyout.d mode=0444 +$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyout.d \ + mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyoutstr.d \ mode=0444 $(sparc_ONLY)file \ path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.D_PROC_ALIGN.misaligned.d mode=0444 $(sparc_ONLY)file \ - path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.D_PROC_ALIGN.misaligned.exe mode=0555 + path=opt/SUNWdtrt/tst/$(ARCH)/pid/err.D_PROC_ALIGN.misaligned.exe \ + mode=0555 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.d mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.exe mode=0555 $(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.br.d mode=0444 @@ -154,7 +155,8 @@ $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.ret.d mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.ret.exe mode=0555 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.exe mode=0555 $(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.ksh mode=0444 -$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/usdt/tst.tailcall.ksh mode=0444 +$(sparc_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/usdt/tst.tailcall.ksh \ + mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.d mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.d.out mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.exe mode=0555 @@ -174,7 +176,8 @@ file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_CLEAR_PROTO.bad.d mode=0444 @@ -186,13 +189,16 @@ file path=opt/SUNWdtrt/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_KEY_TYPE.badkey1.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_KEY_TYPE.badkey2.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_KEY_TYPE.badkey4.d mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_MATCHBASE.d mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_MATCHLIM.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d mode=0444 @@ -211,7 +217,8 @@ file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d \ @@ -220,11 +227,13 @@ file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d mode=0444 -file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d mode=0444 +file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d mode=0444 @@ -333,8 +342,10 @@ file path=opt/SUNWdtrt/tst/common/aggs/tst.truncquant.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/tst.valsortkeypos.d mode=0444 file path=opt/SUNWdtrt/tst/common/aggs/tst.valsortkeypos.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d mode=0444 -file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d mode=0444 -file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d mode=0444 +file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d mode=0444 file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_SYNTAX.addmin.d mode=0444 file path=opt/SUNWdtrt/tst/common/arithmetic/err.D_SYNTAX.divmin.d mode=0444 @@ -356,8 +367,10 @@ file path=opt/SUNWdtrt/tst/common/arrays/tst.basic4.d mode=0444 file path=opt/SUNWdtrt/tst/common/arrays/tst.basic5.d mode=0444 file path=opt/SUNWdtrt/tst/common/arrays/tst.basic6.d mode=0444 file path=opt/SUNWdtrt/tst/common/arrays/tst.uregsarray.d mode=0444 -file path=opt/SUNWdtrt/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d mode=0444 -file path=opt/SUNWdtrt/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d mode=0444 +file path=opt/SUNWdtrt/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/assocs/err.D_OP_INCOMPAT.this.d mode=0444 file path=opt/SUNWdtrt/tst/common/assocs/err.D_PROTO_ARG.badsig.d mode=0444 file path=opt/SUNWdtrt/tst/common/assocs/err.D_PROTO_LEN.toofew.d mode=0444 @@ -391,7 +404,8 @@ file path=opt/SUNWdtrt/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d mode=0444 +file path=opt/SUNWdtrt/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d \ + mode=0444 file \ path=opt/SUNWdtrt/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d \ mode=0444 @@ -420,7 +434,8 @@ file path=opt/SUNWdtrt/tst/common/buffering/tst.switch1.d mode=0444 file path=opt/SUNWdtrt/tst/common/buffering/tst.switch1.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d mode=0444 +file path=opt/SUNWdtrt/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d \ @@ -464,7 +479,8 @@ file path=opt/SUNWdtrt/tst/common/clauses/tst.nopred.d mode=0444 file path=opt/SUNWdtrt/tst/common/clauses/tst.pred.d mode=0444 file path=opt/SUNWdtrt/tst/common/clauses/tst.predfirst.d mode=0444 file path=opt/SUNWdtrt/tst/common/clauses/tst.predlast.d mode=0444 -file path=opt/SUNWdtrt/tst/common/cpc/err.D_PDESC_ZERO.lowfrequency.d mode=0444 +file path=opt/SUNWdtrt/tst/common/cpc/err.D_PDESC_ZERO.lowfrequency.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/cpc/err.D_PDESC_ZERO.malformedoverflow.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/cpc/err.D_PDESC_ZERO.nonexistentevent.d \ @@ -503,7 +519,8 @@ file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d mode=0444 file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_DBLERROR.d mode=0444 file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d mode=0444 file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d mode=0444 -file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d mode=0444 +file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_SPEC.d mode=0444 file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d mode=0444 file path=opt/SUNWdtrt/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d \ @@ -524,9 +541,11 @@ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh \ mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out \ +file \ + path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithID.d.ksh \ mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithID.d.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh \ @@ -539,7 +558,8 @@ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh \ mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out \ +file \ + path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh \ mode=0444 @@ -558,10 +578,14 @@ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh \ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidId1.d.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidId2.d.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidId3.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh \ + mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh \ @@ -590,13 +614,20 @@ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh \ mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh \ + mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh \ @@ -648,7 +679,8 @@ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh \ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.QuietMode.d.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.TestCompile.d.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out \ + mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh \ @@ -659,7 +691,8 @@ file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out \ mode=0444 -file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh mode=0444 +file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh \ + mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out \ mode=0444 file path=opt/SUNWdtrt/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh \ @@ -675,7 +708,8 @@ file path=opt/SUNWdtrt/tst/common/end/tst.end.d mode=0444 file path=opt/SUNWdtrt/tst/common/end/tst.endwithoutbegin.d mode=0444 file path=opt/SUNWdtrt/tst/common/end/tst.multibeginend.d mode=0444 file path=opt/SUNWdtrt/tst/common/end/tst.multiend.d mode=0444 -file path=opt/SUNWdtrt/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d mode=0444 +file path=opt/SUNWdtrt/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/enum/tst.EnumEquality.d mode=0444 @@ -704,16 +738,21 @@ file path=opt/SUNWdtrt/tst/common/fbtprovider/tst.tailcall.d mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_OP_VFPTR.badop.d mode=0444 -file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d mode=0444 +file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d mode=0444 -file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d mode=0444 -file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d mode=0444 +file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d mode=0444 -file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d mode=0444 +file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d \ @@ -727,7 +766,8 @@ file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.motoomany.d mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d mode=0444 -file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d mode=0444 +file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d mode=0444 @@ -806,7 +846,8 @@ file path=opt/SUNWdtrt/tst/common/inline/err.D_DECL_IDRED.redef2.d mode=0444 file path=opt/SUNWdtrt/tst/common/inline/err.D_IDENT_UNDEF.recur.d mode=0444 file path=opt/SUNWdtrt/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d mode=0444 file path=opt/SUNWdtrt/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d mode=0444 -file path=opt/SUNWdtrt/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d mode=0444 +file path=opt/SUNWdtrt/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/inline/tst.InlineDataAssign.d mode=0444 file path=opt/SUNWdtrt/tst/common/inline/tst.InlineExpression.d mode=0444 file path=opt/SUNWdtrt/tst/common/inline/tst.InlineKinds.d mode=0444 @@ -851,12 +892,14 @@ file path=opt/SUNWdtrt/tst/common/java_api/tst.Enable.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.Enable.ksh.out mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.exe mode=0555 file path=opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.ksh.out mode=0444 +file path=opt/SUNWdtrt/tst/common/java_api/tst.FunctionLookup.ksh.out \ + mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.GetAggregate.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.MaxConsumers.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.MaxConsumers.ksh.out mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.MultiAggPrinta.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/java_api/tst.MultiAggPrinta.ksh.out mode=0444 +file path=opt/SUNWdtrt/tst/common/java_api/tst.MultiAggPrinta.ksh.out \ + mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.ProbeData.exe mode=0555 file path=opt/SUNWdtrt/tst/common/java_api/tst.ProbeData.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.ProbeData.ksh.out mode=0444 @@ -871,7 +914,8 @@ file path=opt/SUNWdtrt/tst/common/java_api/tst.printa.d mode=0444 file path=opt/SUNWdtrt/tst/common/java_api/tst.printa.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/lexer/err.D_CHR_NL.char.d mode=0444 file path=opt/SUNWdtrt/tst/common/lexer/err.D_CHR_NULL.char.d mode=0444 -file path=opt/SUNWdtrt/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d mode=0444 +file path=opt/SUNWdtrt/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/lexer/err.D_INT_OFLOW.BigInt.d mode=0444 file path=opt/SUNWdtrt/tst/common/lexer/err.D_STR_NL.string.d mode=0444 file path=opt/SUNWdtrt/tst/common/lexer/err.D_SYNTAX.brace1.d mode=0444 @@ -1001,16 +1045,19 @@ file path=opt/SUNWdtrt/tst/common/plockstat/tst.available.exe mode=0555 file path=opt/SUNWdtrt/tst/common/plockstat/tst.libmap.d mode=0444 file path=opt/SUNWdtrt/tst/common/plockstat/tst.libmap.exe mode=0555 file path=opt/SUNWdtrt/tst/common/pointers/err.BadAlign.d mode=0444 -file path=opt/SUNWdtrt/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d mode=0444 +file path=opt/SUNWdtrt/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/pointers/err.D_ADDROF_VAR.agg.d mode=0444 -file path=opt/SUNWdtrt/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d mode=0444 +file path=opt/SUNWdtrt/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d \ +file \ + path=opt/SUNWdtrt/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/pointers/err.D_OP_LVAL.AddressChange.d \ mode=0444 @@ -1049,7 +1096,8 @@ file path=opt/SUNWdtrt/tst/common/pragma/err.circlibdep.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/pragma/err.invalidlibdep.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/pragma/tst.libchain.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/pragma/tst.libdep.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/pragma/tst.libdepfullyconnected.ksh mode=0444 +file path=opt/SUNWdtrt/tst/common/pragma/tst.libdepfullyconnected.ksh \ + mode=0444 file path=opt/SUNWdtrt/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/predicates/err.D_SYNTAX.invalid.d mode=0444 @@ -1067,7 +1115,8 @@ file path=opt/SUNWdtrt/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d \ file path=opt/SUNWdtrt/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/err.defincomp.d mode=0444 -file path=opt/SUNWdtrt/tst/common/preprocessor/err.ifdefelsenotendif.d mode=0444 +file path=opt/SUNWdtrt/tst/common/preprocessor/err.ifdefelsenotendif.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/err.ifdefincomp.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/err.ifdefnotendif.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/err.incompelse.d mode=0444 @@ -1081,7 +1130,8 @@ file path=opt/SUNWdtrt/tst/common/preprocessor/tst.ifnotdef.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicaland.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicaland.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicalandor.d mode=0444 -file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicalandor.d.out mode=0444 +file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicalandor.d.out \ + mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicalor.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.logicalor.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.muland.d mode=0444 @@ -1090,7 +1140,8 @@ file path=opt/SUNWdtrt/tst/common/preprocessor/tst.mulor.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.mulor.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.precondi.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.precondi.d.out mode=0444 -file path=opt/SUNWdtrt/tst/common/preprocessor/tst.predicatedeclare.d mode=0444 +file path=opt/SUNWdtrt/tst/common/preprocessor/tst.predicatedeclare.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexp.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexp.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpelse.d mode=0444 @@ -1098,15 +1149,20 @@ file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpelse.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpif.d mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpif.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpifelse.d mode=0444 -file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpifelse.d.out mode=0444 +file path=opt/SUNWdtrt/tst/common/preprocessor/tst.preexpifelse.d.out \ + mode=0444 file path=opt/SUNWdtrt/tst/common/preprocessor/tst.withinprobe.d mode=0444 -file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d mode=0444 -file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d mode=0444 -file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_AGGARG.badval.d mode=0444 +file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_AGGARG.badval.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTA_PROTO.bad.d mode=0444 file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d mode=0444 +file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/printa/tst.basics.d mode=0444 @@ -1132,7 +1188,8 @@ file path=opt/SUNWdtrt/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d mode=0444 +file path=opt/SUNWdtrt/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d \ @@ -1190,7 +1247,8 @@ file path=opt/SUNWdtrt/tst/common/privs/tst.func_access.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/privs/tst.op_access.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/privs/tst.unpriv_funcs.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d mode=0444 -file path=opt/SUNWdtrt/tst/common/probes/err.D_PDESC_ZERO.probestar.d mode=0444 +file path=opt/SUNWdtrt/tst/common/probes/err.D_PDESC_ZERO.probestar.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/probes/err.D_PDESC_ZERO.tickstar.d mode=0444 file path=opt/SUNWdtrt/tst/common/probes/err.D_SYNTAX.assign.d mode=0444 file path=opt/SUNWdtrt/tst/common/probes/err.D_SYNTAX.declare.d mode=0444 @@ -1221,11 +1279,14 @@ file path=opt/SUNWdtrt/tst/common/proc/tst.signal.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/proc/tst.sigwait.d mode=0444 file path=opt/SUNWdtrt/tst/common/proc/tst.sigwait.exe mode=0555 file path=opt/SUNWdtrt/tst/common/proc/tst.startexit.ksh mode=0444 -file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZERO.profile.d mode=0444 +file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZERO.profile.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZEROonens.d mode=0444 -file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZEROonensec.d mode=0444 +file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZEROonensec.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZEROoneus.d mode=0444 -file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d mode=0444 +file path=opt/SUNWdtrt/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/profile-n/tst.argtest.d mode=0444 file path=opt/SUNWdtrt/tst/common/profile-n/tst.argtest.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/profile-n/tst.basic.d mode=0444 @@ -1341,14 +1402,21 @@ file path=opt/SUNWdtrt/tst/common/safety/tst.ustackdepth.d mode=0444 file path=opt/SUNWdtrt/tst/common/safety/tst.vahole.d mode=0444 file path=opt/SUNWdtrt/tst/common/safety/tst.violentdeath.ksh mode=0444 file path=opt/SUNWdtrt/tst/common/safety/tst.zonename.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_DECL_CLASS.selfthis.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_DECL_CLASS.thisself.d mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_ARR_LOCAL.thisarray.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_DECL_CLASS.selfthis.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_DECL_CLASS.thisself.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/scalars/err.D_DECL_IDRED.errval.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dec.err.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d mode=0444 -file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dec.err.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupgtype.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupltype.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/scalars/err.D_OP_INCOMPAT.dupttype.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/scalars/err.D_SYNTAX.declare.d mode=0444 file path=opt/SUNWdtrt/tst/common/scalars/tst.basicvar.d mode=0444 file path=opt/SUNWdtrt/tst/common/scalars/tst.basicvar.d.out mode=0444 @@ -1406,7 +1474,8 @@ file path=opt/SUNWdtrt/tst/common/sizeof/err.D_IDENT_BADREF.SizeofAssoc.d \ file path=opt/SUNWdtrt/tst/common/sizeof/err.D_IDENT_UNDEF.UnknownSymbol.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/err.D_SIZEOF_TYPE.d mode=0444 -file path=opt/SUNWdtrt/tst/common/sizeof/err.D_SYNTAX.SizeofBadType.d mode=0444 +file path=opt/SUNWdtrt/tst/common/sizeof/err.D_SYNTAX.SizeofBadType.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofArray.d mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofDataTypes.d mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofExpression.d mode=0444 @@ -1417,8 +1486,10 @@ file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofString1.d mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofString1.d.out mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofString2.d mode=0444 file path=opt/SUNWdtrt/tst/common/sizeof/tst.SizeofString2.d.out mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.BufSizeVariations1.d mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.BufSizeVariations2.d mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/err.BufSizeVariations1.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/err.BufSizeVariations2.d \ + mode=0444 file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithBreakPoint.d \ mode=0444 @@ -1437,11 +1508,13 @@ file \ file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithRaise.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_ACT_SPEC.SpeculateWithStop.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_COMM.AggAftCommit.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithAvg.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithAvg.d \ mode=0444 file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithCount.d \ @@ -1449,9 +1522,11 @@ file \ file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithLquant.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMax.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMax.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMin.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithMin.d \ mode=0444 file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithQuant.d \ @@ -1459,17 +1534,22 @@ file \ file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithStddev.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithSum.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithSum.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_COMM_COMM.CommitAftCommit.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/err.D_COMM_COMM.DisjointCommit.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_COMM_DREC.CommitAftDataRec.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_COMM_DREC.CommitAftDataRec.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_DREC_COMM.DataRecAftCommit.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_DREC_COMM.ExitAfterCommit.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_DREC_COMM.ExitAfterCommit.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/err.D_EXIT_SPEC.ExitAftSpec.d \ mode=0444 @@ -1481,7 +1561,8 @@ file \ file \ path=opt/SUNWdtrt/tst/common/speculation/err.D_PRAGMA_OPTSET.InvalidSpecSize.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/err.D_PRAGMA_OPTSET.NegSpecSize.d \ +file \ + path=opt/SUNWdtrt/tst/common/speculation/err.D_PRAGMA_OPTSET.NegSpecSize.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/err.D_PROTO_LEN.SpecNoId.d \ mode=0444 @@ -1498,12 +1579,16 @@ file path=opt/SUNWdtrt/tst/common/speculation/err.SpecSizeVariations1.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/err.SpecSizeVariations2.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/tst.CommitAfterDiscard.d mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/tst.CommitAfterDiscard.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.CommitWithZero.d mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/tst.DataRecAftDiscard.d mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/tst.DataRecAftDiscard.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.DiscardAftCommit.d mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/tst.DiscardAftDataRec.d mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/tst.DiscardAftDiscard.d mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/tst.DiscardAftDataRec.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/tst.DiscardAftDiscard.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.DiscardWithZero.d mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.ExitAftDiscard.d mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.NoSpecBuffer.d mode=0444 @@ -1515,8 +1600,10 @@ file path=opt/SUNWdtrt/tst/common/speculation/tst.SpecSizeVariations3.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculateWithRandom.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculationCommit.d mode=0444 -file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculationDiscard.d mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculationCommit.d \ + mode=0444 +file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculationDiscard.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculationID.d mode=0444 file path=opt/SUNWdtrt/tst/common/speculation/tst.SpeculationWithZero.d \ mode=0444 @@ -1542,11 +1629,13 @@ file path=opt/SUNWdtrt/tst/common/struct/err.D_ADDROF_VAR.StructPointer.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_COMBO.StructWithoutColon.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_COMBO.StructWithoutColon1.d \ +file \ + path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_COMBO.StructWithoutColon1.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_INCOMPLETE.circular.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_INCOMPLETE.order.d mode=0444 +file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_INCOMPLETE.order.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_INCOMPLETE.order2.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/struct/err.D_DECL_INCOMPLETE.recursive.d \ @@ -1606,7 +1695,8 @@ file path=opt/SUNWdtrt/tst/common/tracemem/err.D_TRACEMEM_SIZE.negsize.d \ file path=opt/SUNWdtrt/tst/common/tracemem/err.D_TRACEMEM_SIZE.zerosize.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/tracemem/tst.rootvp.d mode=0444 -file path=opt/SUNWdtrt/tst/common/translators/err.D_DECL_TYPERED.BadTransDecl.d \ +file \ + path=opt/SUNWdtrt/tst/common/translators/err.D_DECL_TYPERED.BadTransDecl.d \ mode=0444 file \ path=opt/SUNWdtrt/tst/common/translators/err.D_OP_INCOMPLETE.NonExistentInput1.d \ @@ -1638,7 +1728,8 @@ file path=opt/SUNWdtrt/tst/common/translators/err.D_XLATE_SOU.BadTransInt.d \ file \ path=opt/SUNWdtrt/tst/common/translators/err.D_XLATE_SOU.NonExistentOutput1.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/translators/tst.CircularTransDecl.d mode=0444 +file path=opt/SUNWdtrt/tst/common/translators/tst.CircularTransDecl.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.EmptyTransDecl.d mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.ForwardTag.d mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.InputAliasTrans.d mode=0444 @@ -1649,13 +1740,15 @@ file path=opt/SUNWdtrt/tst/common/translators/tst.PartialDereferencing.d \ file path=opt/SUNWdtrt/tst/common/translators/tst.PartialOutputTransDefn.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.ProcModelTrans.d mode=0444 -file path=opt/SUNWdtrt/tst/common/translators/tst.RepeatDeclaration.d mode=0444 +file path=opt/SUNWdtrt/tst/common/translators/tst.RepeatDeclaration.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.SimultaneousTranslators.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.StructureAssignment.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.TransNonPointer.d mode=0444 -file path=opt/SUNWdtrt/tst/common/translators/tst.TransOutputPointer.d mode=0444 +file path=opt/SUNWdtrt/tst/common/translators/tst.TransOutputPointer.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.TransPointer.d mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.TranslateSelf.d mode=0444 file path=opt/SUNWdtrt/tst/common/translators/tst.UnionInputTrans.d mode=0444 @@ -1672,7 +1765,8 @@ file path=opt/SUNWdtrt/tst/common/types/err.D_CAST_INVAL.badcast.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_CG_DYN.ResultDynType.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_CHR_OFLOW.charconst.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_BADCLASS.bad.d mode=0444 -file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_CHARATTR.badtype3.d mode=0444 +file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_CHARATTR.badtype3.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_COMBO.badtype4.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_COMBO.badtype5.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_ENCONST.badeval.d mode=0444 @@ -1682,7 +1776,8 @@ file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_SCOPE.scopeop.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_DECL_USELESS.baddec.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_OP_ACT.badcond.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_OP_ARITH.badoperand.d mode=0444 -file path=opt/SUNWdtrt/tst/common/types/err.D_OP_INCOMPAT.badassign.d mode=0444 +file path=opt/SUNWdtrt/tst/common/types/err.D_OP_INCOMPAT.badassign.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_OP_INT.badbitop.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_OP_INT.badshift.d mode=0444 file path=opt/SUNWdtrt/tst/common/types/err.D_OP_SCALAR.badcond.d mode=0444 @@ -1729,10 +1824,12 @@ file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_COMBO.UnionWithoutColon1.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_INCOMPLETE.circular.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_INCOMPLETE.order.d mode=0444 +file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_INCOMPLETE.order.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_INCOMPLETE.recursive.d \ mode=0444 -file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_INCOMPLETE.simple.d mode=0444 +file path=opt/SUNWdtrt/tst/common/union/err.D_DECL_INCOMPLETE.simple.d \ + mode=0444 file path=opt/SUNWdtrt/tst/common/union/err.D_PROTO_ARG.DupUnionAssoc.d \ mode=0444 file path=opt/SUNWdtrt/tst/common/union/tst.UnionAssoc.d mode=0444 @@ -1795,7 +1892,8 @@ $(i386_ONLY)file path=opt/SUNWdtrt/tst/i86xpv/xdt/tst.basic.ksh mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/i86xpv/xdt/tst.hvmenable.ksh mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/i86xpv/xdt/tst.memenable.ksh mode=0444 $(i386_ONLY)file path=opt/SUNWdtrt/tst/i86xpv/xdt/tst.schedargs.ksh mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/i86xpv/xdt/tst.schedenable.ksh mode=0444 +$(i386_ONLY)file path=opt/SUNWdtrt/tst/i86xpv/xdt/tst.schedenable.ksh \ + mode=0444 legacy pkg=SUNWdtrt arch=$(ARCH) category=internal \ desc="DTrace Test Suite Internal Distribution" \ hotline="Contact the DTrace discussion forum" name="DTrace Test Suite" \ diff --git a/usr/src/pkg/manifests/system-dtrace.mf b/usr/src/pkg/manifests/system-dtrace.mf index f3969f01c0..292e42bb34 100644 --- a/usr/src/pkg/manifests/system-dtrace.mf +++ b/usr/src/pkg/manifests/system-dtrace.mf @@ -20,12 +20,11 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/dtrace@0.5.11,5.11-0.134 set name=pkg.renamed value=true set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal -depend fmri=pkg:/system/kernel/dtrace/providers/xdt@0.5.11,5.11-0.134 type=require +depend fmri=pkg:/system/kernel/dtrace/providers/xdt@0.5.11,5.11-0.134 \ + type=require diff --git a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf index 278dd00910..f991d08249 100644 --- a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf +++ b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf @@ -20,73 +20,55 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/embedded-fcode-interpreter@$(PKGVERS) set name=pkg.description value="Embedded FCode Interpreter Drivers" set name=pkg.summary value="Embedded FCode Interpreter Drivers" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/flash group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/flash/postdeployment group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/sun4u/kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/sun4u/kernel/misc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/flash group=sys +dir path=etc/flash/postdeployment group=sys +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/misc group=sys +dir path=kernel/misc/$(ARCH64) group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4u group=sys +dir path=lib/svc/manifest/platform/sun4v group=sys +dir path=platform group=sys +dir path=platform/sun4u group=sys +dir path=platform/sun4u/kernel group=sys +dir path=platform/sun4u/kernel/misc group=sys +dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/efcode dir path=usr/lib/efcode/$(ARCH64) -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform/sun4v group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=fcode -file path=etc/flash/postdeployment/efcode.cleanup group=sys mode=0744 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/fcode group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/fcode.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/fcodem group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/fcpci group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/pcicfg group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwo_cpu group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwocfg group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global +file path=etc/flash/postdeployment/efcode.cleanup group=sys mode=0744 +file path=kernel/drv/$(ARCH64)/fcode group=sys +file path=kernel/drv/fcode.conf group=sys +file path=kernel/misc/$(ARCH64)/fcodem group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/fcpci group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/pcicfg group=sys mode=0755 +file path=lib/svc/manifest/platform/sun4u/efdaemon.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4v/efdaemon.xml group=sys mode=0444 +file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwo_cpu group=sys mode=0755 +file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwocfg group=sys mode=0755 file path=usr/lib/efcode/$(ARCH64)/efdaemon mode=0555 file path=usr/lib/efcode/$(ARCH64)/fcdriver.so file path=usr/lib/efcode/$(ARCH64)/fcode.so @@ -98,10 +80,6 @@ file path=usr/lib/efcode/$(ARCH64)/lfc_jupiter.so file path=usr/lib/efcode/$(ARCH64)/lfc_upa.so file path=usr/lib/efcode/$(ARCH64)/lfc_upa_pci.so file path=usr/lib/efcode/efcode.sh mode=0555 -file path=lib/svc/manifest/platform/sun4u/efdaemon.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/platform/sun4v/efdaemon.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWefc.u arch=$(ARCH).sun4u category=system \ desc="Embedded FCode Interpreter Drivers" \ hotline="Please contact your local service provider" \ @@ -112,7 +90,8 @@ legacy pkg=SUNWefck arch=$(ARCH) category=system \ hotline="Please contact your local service provider" \ name="Embedded FCode Interpreter Drivers" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 -legacy pkg=SUNWefcl arch=$(ARCH) category=system desc="Embedded FCode Libraries" \ +legacy pkg=SUNWefcl arch=$(ARCH) category=system \ + desc="Embedded FCode Libraries" \ hotline="Please contact your local service provider" \ name="Embedded FCode Libraries" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 @@ -130,7 +109,8 @@ license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_gptwo.so target=lfc_gptwo.so link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_pci.so target=lfc_upa_pci.so -link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_jupiter.so target=lfc_jupiter.so +link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_jupiter.so \ + target=lfc_jupiter.so link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_pciex.so target=lfc_upa_pci.so link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pci.so target=lfc_upa_pci.so link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pciex.so target=lfc_upa_pci.so diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf index 1557d14be8..8026f6c573 100644 --- a/usr/src/pkg/manifests/system-extended-system-utilities.mf +++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/extended-system-utilities@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Extended System Utilities" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin $(i386_ONLY)dir path=usr/bin/$(ARCH32) diff --git a/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf b/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf index bc3b0e830e..c414304db0 100644 --- a/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf +++ b/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -32,7 +31,6 @@ set name=pkg.summary value="Eversholt unbundled utilities" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/fm diff --git a/usr/src/pkg/manifests/system-fault-management-mtst.mf b/usr/src/pkg/manifests/system-fault-management-mtst.mf index c60eb6581b..5534ec644c 100644 --- a/usr/src/pkg/manifests/system-fault-management-mtst.mf +++ b/usr/src/pkg/manifests/system-fault-management-mtst.mf @@ -20,18 +20,17 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/fault-management/mtst@$(PKGVERS) -set name=pkg.description value="CPU/memory error injector for internal testing" +set name=pkg.description \ + value="CPU/memory error injector for internal testing" set name=pkg.summary value="CPU/memory error injector" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=org.opensolaris.redist value=internal set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(i386_ONLY)dir path=kernel group=sys $(i386_ONLY)dir path=kernel/drv group=sys $(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys @@ -61,13 +60,11 @@ $(sparc_ONLY)dir path=usr/platform/sun4v/include/sys driver name=memtest perms="* 0660 root sys" $(i386_ONLY)file path=kernel/drv/$(ARCH64)/memtest group=sys $(i386_ONLY)file path=kernel/drv/memtest group=sys -$(i386_ONLY)file path=kernel/drv/memtest.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/memtest.conf group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/memtest group=sys -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/memtest.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/memtest.conf group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/memtest group=sys -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/memtest.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/memtest.conf group=sys file path=usr/bin/mtst mode=0555 $(i386_ONLY)file path=usr/include/sys/memtest.h group=sys $(i386_ONLY)file path=usr/platform/i86pc/lib/mtst/mtst_AuthenticAMD.so diff --git a/usr/src/pkg/manifests/system-file-system-autofs.mf b/usr/src/pkg/manifests/system-file-system-autofs.mf index 3a428ade6a..41a0c07f08 100644 --- a/usr/src/pkg/manifests/system-file-system-autofs.mf +++ b/usr/src/pkg/manifests/system-file-system-autofs.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/file-system/autofs@$(PKGVERS) @@ -31,11 +30,13 @@ set name=pkg.summary value=AutoFS set name=info.classification \ value="org.opensolaris.category.2008:System/File System" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/filesystem group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib @@ -43,13 +44,11 @@ dir path=usr/lib/autofs group=sys dir path=usr/lib/fs group=sys dir path=usr/lib/fs/autofs group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys -dir path=lib/svc/manifest/system/filesystem group=sys file path=etc/auto_home original_name=SUNWatfs:etc/auto_home preserve=true file path=etc/auto_master original_name=SUNWatfs:etc/auto_master preserve=true -file path=etc/default/autofs group=sys original_name=SUNWatfs:etc/default/autofs \ - preserve=true +file path=etc/default/autofs group=sys \ + original_name=SUNWatfs:etc/default/autofs preserve=true +file path=lib/svc/manifest/system/filesystem/autofs.xml group=sys mode=0444 file path=lib/svc/method/svc-autofs mode=0555 file path=usr/lib/autofs/automountd mode=0555 file path=usr/lib/fs/autofs/automount mode=0555 @@ -57,11 +56,11 @@ file path=usr/lib/fs/autofs/dfshares mode=0555 file path=usr/lib/fs/autofs/mount mode=0555 file path=usr/lib/fs/autofs/share mode=0555 file path=usr/lib/fs/autofs/unshare mode=0555 -file path=lib/svc/manifest/system/filesystem/autofs.xml group=sys mode=0444 legacy pkg=SUNWatfsr arch=$(ARCH) category=system \ desc="configuration and start-up files for the AutoFS filesystem" \ - hotline="Please contact your local service provider" name="AutoFS, (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="AutoFS, (Root)" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 legacy pkg=SUNWatfsu arch=$(ARCH) category=system \ desc="utilities and a daemon (automountd) for the AutoFS filesystem" \ hotline="Please contact your local service provider" name="AutoFS, (Usr)" \ diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf index fd34ac0ff2..150605b42f 100644 --- a/usr/src/pkg/manifests/system-file-system-nfs.mf +++ b/usr/src/pkg/manifests/system-file-system-nfs.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/file-system/nfs@$(PKGVERS) @@ -30,27 +29,22 @@ set name=pkg.summary value="Network File System (NFS) client support" set name=info.classification \ value="org.opensolaris.category.2008:System/File System" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys dir path=etc/fs group=sys dir path=etc/fs/nfs group=sys -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/fs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/fs/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/misc/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/sys group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/sys/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/fs group=sys +dir path=kernel/fs/$(ARCH64) group=sys +dir path=kernel/misc group=sys +dir path=kernel/misc/$(ARCH64) group=sys +dir path=kernel/sys group=sys +dir path=kernel/sys/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nfs group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -63,30 +57,24 @@ dir path=var group=sys dir path=var/nfs dir path=var/nfs/v4_oldstate group=daemon owner=daemon dir path=var/nfs/v4_state group=daemon owner=daemon -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/nfs group=sys file path=etc/default/nfs group=sys original_name=SUNWnfsc:etc/default/nfs \ preserve=true file path=etc/fs/nfs/mount mode=0555 file path=etc/nfssec.conf group=sys original_name=SUNWnfsc:etc/nfssec.conf \ preserve=true -file path=kernel/fs/$(ARCH64)/nfs group=sys mode=0755 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/fs/nfs group=sys mode=0755 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/klmmod group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/klmops group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -file path=kernel/misc/$(ARCH64)/nfs_dlboot group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/klmmod group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/klmops group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/misc/nfs_dlboot group=sys mode=0755 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global +file path=kernel/fs/$(ARCH64)/nfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/nfs group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/klmmod group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/klmops group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/nfs_dlboot group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/klmmod group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/klmops group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/nfs_dlboot group=sys mode=0755 +file path=lib/svc/manifest/network/nfs/cbd.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/mapid.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/nlockmgr.xml group=sys mode=0444 +file path=lib/svc/manifest/network/nfs/status.xml group=sys mode=0444 file path=lib/svc/method/nfs-client mode=0555 file path=lib/svc/method/nlockmgr mode=0555 file path=usr/bin/nfsstat mode=0555 @@ -103,16 +91,9 @@ file path=usr/lib/nfs/lockd mode=0555 file path=usr/lib/nfs/nfs4cbd mode=0555 file path=usr/lib/nfs/nfsmapid mode=0555 file path=usr/lib/nfs/statd mode=0555 -file path=lib/svc/manifest/network/nfs/cbd.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nfs/client.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nfs/mapid.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nfs/nlockmgr.xml group=sys mode=0444 -file path=lib/svc/manifest/network/nfs/status.xml group=sys mode=0444 group groupname=unknown gid=96 -hardlink path=kernel/sys/$(ARCH64)/nfs opensolaris.zone=global \ - target=../../../kernel/fs/$(ARCH64)/nfs variant.opensolaris.zone=global -$(i386_ONLY)hardlink path=kernel/sys/nfs opensolaris.zone=global \ - target=../../kernel/fs/nfs variant.opensolaris.zone=global +hardlink path=kernel/sys/$(ARCH64)/nfs target=../../../kernel/fs/$(ARCH64)/nfs +$(i386_ONLY)hardlink path=kernel/sys/nfs target=../../kernel/fs/nfs legacy pkg=SUNWnfsckr arch=$(ARCH) category=system \ desc="Network File System (NFS) client kernel support (Root)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf b/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf index aebf498854..18bddecae2 100644 --- a/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf +++ b/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -32,7 +31,6 @@ set name=pkg.summary value="ntfsprogs - Utilities that provide access to NTFS" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/sbin diff --git a/usr/src/pkg/manifests/system-file-system-smb.mf b/usr/src/pkg/manifests/system-file-system-smb.mf index 6642504879..b87b2c70c4 100644 --- a/usr/src/pkg/manifests/system-file-system-smb.mf +++ b/usr/src/pkg/manifests/system-file-system-smb.mf @@ -29,9 +29,11 @@ set name=pkg.summary value="SMB/CIFS File System client support" set name=info.classification \ value="org.opensolaris.category.2008:System/File System" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/smb group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin @@ -53,10 +55,8 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/lib/security dir path=usr/lib/security/$(ARCH64) dir path=usr/lib/smbfs -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/smb group=sys driver name=nsmb devlink=type=ddi_pseudo;name=nsmb\t\D perms="* 0666 root sys" +file path=lib/svc/manifest/network/smb/client.xml group=sys mode=0444 file path=lib/svc/method/smb-client mode=0555 file path=usr/bin/smbutil mode=0555 file path=usr/kernel/drv/$(ARCH64)/nsmb group=sys @@ -82,7 +82,6 @@ file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1 file path=usr/lib/security/pam_smbfs_login.so.1 file path=usr/lib/smbfs/smbiod mode=0555 file path=usr/lib/smbfs/smbiod-svc mode=0555 -file path=lib/svc/manifest/network/smb/client.xml group=sys mode=0444 legacy pkg=SUNWsmbfskr arch=$(ARCH) category=system \ desc="SMB/CIFS File System client support (Kernel)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-file-system-udfs.mf b/usr/src/pkg/manifests/system-file-system-udfs.mf index dbf8f8b411..ca84134dd4 100644 --- a/usr/src/pkg/manifests/system-file-system-udfs.mf +++ b/usr/src/pkg/manifests/system-file-system-udfs.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/file-system/udfs@$(PKGVERS) @@ -29,21 +28,15 @@ set name=pkg.description value="Universal Disk Format 1.50 File System" set name=pkg.summary value="Universal Disk Format 1.50" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/fs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/fs/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/fs group=sys +dir path=kernel/fs/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/fs group=sys dir path=usr/lib/fs/udfs group=sys -file path=kernel/fs/$(ARCH64)/udfs group=sys mode=0755 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/fs/udfs group=sys mode=0755 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global +file path=kernel/fs/$(ARCH64)/udfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/udfs group=sys mode=0755 file path=usr/lib/fs/udfs/fsck mode=0555 file path=usr/lib/fs/udfs/fsdb mode=0555 file path=usr/lib/fs/udfs/fstyp.so.1 mode=0555 diff --git a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf index 835eb046e1..2ace5309c4 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/file-system/zfs/tests@$(PKGVERS) @@ -30,13 +29,9 @@ set name=pkg.summary value="ZFS unbundled utilities" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/bin $(i386_ONLY)dir path=usr/bin/$(ARCH32) @@ -51,12 +46,9 @@ dir path=usr/sbin $(i386_ONLY)dir path=usr/sbin/$(ARCH32) dir path=usr/sbin/$(ARCH64) driver name=zut perms="* 0666 root sys" -file path=kernel/drv/$(ARCH64)/zut group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/zut group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/zut.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/zut group=sys +$(i386_ONLY)file path=kernel/drv/zut group=sys +file path=kernel/drv/zut.conf group=sys $(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555 $(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555 file path=usr/bin/$(ARCH64)/zlook mode=0555 diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf index 61d6af0247..f94d271136 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs.mf @@ -35,27 +35,19 @@ set name=info.classification \ # set name=org.opensolaris.nodepend value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/fs group=sys dir path=etc/fs/zfs group=sys dir path=etc/sysevent group=sys dir path=etc/sysevent/config group=sys dir path=etc/zfs group=sys -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/fs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/fs/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/kmdb/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/fs group=sys +dir path=kernel/fs/$(ARCH64) group=sys +dir path=kernel/kmdb group=sys +dir path=kernel/kmdb/$(ARCH64) group=sys dir path=lib dir path=lib/$(ARCH64) dir path=sbin group=sys @@ -82,16 +74,11 @@ dir path=usr/sbin $(i386_ONLY)dir path=usr/sbin/$(ARCH32) dir path=usr/sbin/$(ARCH64) driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys" -file path=kernel/drv/$(ARCH64)/zfs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/zfs group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/zfs.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global -file path=kernel/kmdb/$(ARCH64)/zfs group=sys mode=0555 opensolaris.zone=global \ - reboot-needed=true variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/kmdb/zfs group=sys mode=0555 \ - opensolaris.zone=global reboot-needed=true variant.opensolaris.zone=global +file path=kernel/drv/$(ARCH64)/zfs group=sys +$(i386_ONLY)file path=kernel/drv/zfs group=sys +file path=kernel/drv/zfs.conf group=sys +file path=kernel/kmdb/$(ARCH64)/zfs group=sys mode=0555 +$(i386_ONLY)file path=kernel/kmdb/zfs group=sys mode=0555 file path=lib/$(ARCH64)/libzfs.so.1 file path=lib/$(ARCH64)/llib-lzfs.ln file path=lib/libzfs.so.1 @@ -135,10 +122,8 @@ file path=usr/lib/zfs/pyzfs.pyc mode=0555 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zdb mode=0555 file path=usr/sbin/$(ARCH64)/zdb mode=0555 file path=usr/sbin/zstreamdump mode=0555 -hardlink path=kernel/fs/$(ARCH64)/zfs opensolaris.zone=global \ - target=../../../kernel/drv/$(ARCH64)/zfs variant.opensolaris.zone=global -$(i386_ONLY)hardlink path=kernel/fs/zfs opensolaris.zone=global \ - target=../../kernel/drv/zfs variant.opensolaris.zone=global +hardlink path=kernel/fs/$(ARCH64)/zfs target=../../../kernel/drv/$(ARCH64)/zfs +$(i386_ONLY)hardlink path=kernel/fs/zfs target=../../kernel/drv/zfs hardlink path=usr/lib/fs/zfs/fstyp target=../../../sbin/fstyp hardlink path=usr/sbin/zdb target=../../usr/lib/isaexec legacy pkg=SUNWzfskr arch=$(ARCH) category=system \ @@ -159,7 +144,8 @@ link path=etc/fs/zfs/mount target=../../../sbin/zfs link path=etc/fs/zfs/umount target=../../../sbin/zfs link path=lib/$(ARCH64)/libzfs.so target=libzfs.so.1 link path=lib/libzfs.so target=libzfs.so.1 -link path=usr/lib/$(ARCH64)/libzfs.so target=../../../lib/$(ARCH64)/libzfs.so.1 +link path=usr/lib/$(ARCH64)/libzfs.so \ + target=../../../lib/$(ARCH64)/libzfs.so.1 link path=usr/lib/$(ARCH64)/libzfs.so.1 \ target=../../../lib/$(ARCH64)/libzfs.so.1 link path=usr/lib/$(ARCH64)/libzfs_jni.so target=libzfs_jni.so.1 diff --git a/usr/src/pkg/manifests/system-flash-fwflash.mf b/usr/src/pkg/manifests/system-flash-fwflash.mf index 437dc7c4d3..40667b5777 100644 --- a/usr/src/pkg/manifests/system-flash-fwflash.mf +++ b/usr/src/pkg/manifests/system-flash-fwflash.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/flash/fwflash@$(PKGVERS) set name=pkg.description value="Sun Firmware Flash Update Tool (fwflash)" set name=pkg.summary value="Sun Firmware Flash Update Tool (fwflash)" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/fwflash diff --git a/usr/src/pkg/manifests/system-floating-point-scrubber.mf b/usr/src/pkg/manifests/system-floating-point-scrubber.mf index 4fc7090047..45e47a947b 100644 --- a/usr/src/pkg/manifests/system-floating-point-scrubber.mf +++ b/usr/src/pkg/manifests/system-floating-point-scrubber.mf @@ -20,23 +20,25 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/floating-point-scrubber@$(PKGVERS) set name=pkg.description value="FP Scrubber configuration files" set name=pkg.summary value="FP Scrubber configuration files" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/fps @@ -46,13 +48,9 @@ dir path=usr/lib/fps/sun4u/UltraSPARC-III+ dir path=usr/lib/fps/sun4u/UltraSPARC-IIIi dir path=usr/lib/fps/sun4u/UltraSPARC-IV dir path=usr/lib/fps/sun4u/UltraSPARC-IV+ -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys +file path=lib/svc/manifest/system/fpsd.xml group=sys mode=0444 file path=usr/lib/fps/fpsd mode=0555 file path=usr/lib/fps/sun4u/UltraSPARC-III/fptest mode=0555 -file path=lib/svc/manifest/system/fpsd.xml group=sys mode=0444 legacy pkg=SUNWfsr arch=$(ARCH) category=system \ desc="FP Scrubber configuration files (ROOT)" \ hotline="Please contact your local service provider" \ @@ -71,4 +69,5 @@ link path=usr/lib/fps/sun4u/UltraSPARC-IIIi/fptest \ target=../UltraSPARC-III/fptest link path=usr/lib/fps/sun4u/UltraSPARC-IV+/fptest \ target=../UltraSPARC-III/fptest -link path=usr/lib/fps/sun4u/UltraSPARC-IV/fptest target=../UltraSPARC-III/fptest +link path=usr/lib/fps/sun4u/UltraSPARC-IV/fptest \ + target=../UltraSPARC-III/fptest diff --git a/usr/src/pkg/manifests/system-fru-id-platform.mf b/usr/src/pkg/manifests/system-fru-id-platform.mf index b1b96f445d..898fba2f66 100644 --- a/usr/src/pkg/manifests/system-fru-id-platform.mf +++ b/usr/src/pkg/manifests/system-fru-id-platform.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/fru-id/platform@$(PKGVERS) -set name=pkg.description value="FRU ID platform data module and access library" +set name=pkg.description \ + value="FRU ID platform data module and access library" set name=pkg.summary value="FRU ID Platform Modules" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys $(i386_ONLY)dir path=usr/lib $(i386_ONLY)dir path=usr/lib/picl group=sys @@ -46,7 +45,8 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-T12/lib @@ -59,7 +59,8 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,SPARC-Enterprise/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Serverblade1/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-1000/lib/picl group=sys @@ -78,47 +79,57 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins \ $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V215/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V240/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V250/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V440/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V445/sbin $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins group=sys +$(sparc_ONLY)dir path=usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins \ + group=sys $(sparc_ONLY)dir path=usr/platform/sun4u group=sys $(sparc_ONLY)dir path=usr/platform/sun4u/lib $(sparc_ONLY)dir path=usr/platform/sun4u/lib/picl group=sys diff --git a/usr/src/pkg/manifests/system-fru-id.mf b/usr/src/pkg/manifests/system-fru-id.mf index 5f23badd94..7f6029e77e 100644 --- a/usr/src/pkg/manifests/system-fru-id.mf +++ b/usr/src/pkg/manifests/system-fru-id.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/fru-id@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="FRU ID Utility and Library" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) @@ -57,7 +55,8 @@ legacy pkg=SUNWfruid arch=$(ARCH) category=system \ license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libfru.so target=./libfru.so.1 -$(sparc_ONLY)link path=usr/lib/$(ARCH64)/libfrupicl.so target=./libfrupicl.so.1 +$(sparc_ONLY)link path=usr/lib/$(ARCH64)/libfrupicl.so \ + target=./libfrupicl.so.1 link path=usr/lib/$(ARCH64)/libfruraw.so target=./libfruraw.so.1 link path=usr/lib/$(ARCH64)/libfrureg.so target=./libfrureg.so.1 link path=usr/lib/$(ARCH64)/libfruutils.so target=./libfruutils.so.1 diff --git a/usr/src/pkg/manifests/system-header-header-agp.mf b/usr/src/pkg/manifests/system-header-header-agp.mf index 9007043f7e..a61225e8d7 100644 --- a/usr/src/pkg/manifests/system-header-header-agp.mf +++ b/usr/src/pkg/manifests/system-header-header-agp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-agp@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="AGP GART Driver Header Files" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/system-header-header-audio.mf b/usr/src/pkg/manifests/system-header-header-audio.mf index d368b43da9..bdaab784a3 100644 --- a/usr/src/pkg/manifests/system-header-header-audio.mf +++ b/usr/src/pkg/manifests/system-header-header-audio.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-audio@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Audio Header Files" set name=info.classification value=org.opensolaris.category.2008:System/Media set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/audio diff --git a/usr/src/pkg/manifests/system-header-header-firewire.mf b/usr/src/pkg/manifests/system-header-header-firewire.mf index d359a60765..4ae4ccaf46 100644 --- a/usr/src/pkg/manifests/system-header-header-firewire.mf +++ b/usr/src/pkg/manifests/system-header-header-firewire.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-firewire@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Sun IEEE1394 Framework Header Files" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys @@ -45,7 +43,7 @@ file path=usr/include/sys/1394/t1394.h legacy pkg=SUNW1394h arch=$(ARCH) category=system \ desc="Sun IEEE1394 Header Files" \ hotline="Please contact your local service provider" \ - name="Sun IEEE1394 Framework Header Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun IEEE1394 Framework Header Files" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header-header-ifp.mf b/usr/src/pkg/manifests/system-header-header-ifp.mf index bbeccd3c2d..7e4a67de76 100644 --- a/usr/src/pkg/manifests/system-header-header-ifp.mf +++ b/usr/src/pkg/manifests/system-header-header-ifp.mf @@ -20,18 +20,17 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-ifp@$(PKGVERS) set name=pkg.description value="SunOS Header Files For QLogic FC-AL Family" set name=pkg.summary \ value="Sun Fibre Channel Arbitrated Loop Driver Header Files" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=org.opensolaris.redist value=nonredist set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/system-header-header-picl.mf b/usr/src/pkg/manifests/system-header-header-picl.mf index 13f39182e8..0ea15252cd 100644 --- a/usr/src/pkg/manifests/system-header-header-picl.mf +++ b/usr/src/pkg/manifests/system-header-header-picl.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-picl@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="PICL Header Files" set name=pkg.summary value="PICL Header Files" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include file path=usr/include/picl.h diff --git a/usr/src/pkg/manifests/system-header-header-platform.mf b/usr/src/pkg/manifests/system-header-header-platform.mf index e87a92ef79..6bbb98c9e8 100644 --- a/usr/src/pkg/manifests/system-header-header-platform.mf +++ b/usr/src/pkg/manifests/system-header-header-platform.mf @@ -24,6 +24,5 @@ # set name=pkg.fmri value=pkg:/system/header/header-platform@0.5.11,5.11-0.142 -set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal set name=pkg.obsolete value=true +set name=variant.arch value=sparc diff --git a/usr/src/pkg/manifests/system-header-header-storage.mf b/usr/src/pkg/manifests/system-header-header-storage.mf index 1d978b80bc..2507db748d 100644 --- a/usr/src/pkg/manifests/system-header-header-storage.mf +++ b/usr/src/pkg/manifests/system-header-header-storage.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-storage@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Platform Support, Driver Header Files" set name=info.classification \ value="org.opensolaris.category.2008:Drivers/Other Peripherals" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/system-header-header-ugen.mf b/usr/src/pkg/manifests/system-header-header-ugen.mf index c91fca1ff2..3004fdd7ba 100644 --- a/usr/src/pkg/manifests/system-header-header-ugen.mf +++ b/usr/src/pkg/manifests/system-header-header-ugen.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-ugen@$(PKGVERS) set name=pkg.description value="UGEN Headers" set name=pkg.summary value="UGEN Headers" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/system-header-header-usb.mf b/usr/src/pkg/manifests/system-header-header-usb.mf index 231ee4c244..b4bca75d91 100644 --- a/usr/src/pkg/manifests/system-header-header-usb.mf +++ b/usr/src/pkg/manifests/system-header-header-usb.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/header/header-usb@$(PKGVERS) set name=pkg.description value="USB Headers" set name=pkg.summary value="USB Headers" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 8c8e24d98b..3cca51f180 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -29,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="SunOS Header Files" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include $(i386_ONLY)dir path=usr/include/$(ARCH64) @@ -472,10 +471,10 @@ file path=usr/include/libdevice.h file path=usr/include/libdevinfo.h file path=usr/include/libdladm.h file path=usr/include/libdlbridge.h +file path=usr/include/libdlib.h file path=usr/include/libdllink.h file path=usr/include/libdlpi.h file path=usr/include/libdlvlan.h -file path=usr/include/libdlib.h file path=usr/include/libelf.h $(i386_ONLY)file path=usr/include/libfdisk.h file path=usr/include/libfstyp.h @@ -484,9 +483,9 @@ file path=usr/include/libgen.h file path=usr/include/libgrubmgmt.h file path=usr/include/libintl.h file path=usr/include/libipmi.h -file path=usr/include/libnwam.h file path=usr/include/libipp.h file path=usr/include/libnvpair.h +file path=usr/include/libnwam.h file path=usr/include/libpolkit/libpolkit.h file path=usr/include/librcm.h file path=usr/include/libscf.h @@ -1076,7 +1075,6 @@ $(i386_ONLY)file path=usr/include/sys/hypervisor.h $(i386_ONLY)file path=usr/include/sys/i8272A.h file path=usr/include/sys/ia.h file path=usr/include/sys/iapriocntl.h -file path=usr/include/sys/ibpart.h file path=usr/include/sys/ib/adapters/hermon/hermon_ioctl.h file path=usr/include/sys/ib/adapters/tavor/tavor_ioctl.h file path=usr/include/sys/ib/clients/ibd/ibd.h @@ -1088,8 +1086,8 @@ file path=usr/include/sys/ib/clients/of/rdma/rdma_cm.h file path=usr/include/sys/ib/clients/of/rdma/rdma_user_cm.h file path=usr/include/sys/ib/clients/of/sol_ofs/sol_cma.h file path=usr/include/sys/ib/clients/of/sol_ofs/sol_ib_cma.h -file path=usr/include/sys/ib/clients/of/sol_ofs/sol_ofs_common.h file path=usr/include/sys/ib/clients/of/sol_ofs/sol_kverb_impl.h +file path=usr/include/sys/ib/clients/of/sol_ofs/sol_ofs_common.h file path=usr/include/sys/ib/clients/of/sol_ucma/sol_rdma_user_cm.h file path=usr/include/sys/ib/clients/of/sol_ucma/sol_ucma.h file path=usr/include/sys/ib/clients/of/sol_uverbs/sol_uverbs.h @@ -1118,6 +1116,7 @@ file path=usr/include/sys/ib/mgt/ibmf/ibmf_saa.h file path=usr/include/sys/ib/mgt/ibmf/ibmf_utils.h file path=usr/include/sys/ib/mgt/sa_recs.h file path=usr/include/sys/ib/mgt/sm_attr.h +file path=usr/include/sys/ibpart.h file path=usr/include/sys/id32.h file path=usr/include/sys/id_space.h file path=usr/include/sys/idmap.h @@ -1894,10 +1893,12 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/include \ target=../sun4u/include $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/include \ target=../sun4u/include -$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/include target=../sun4u/include +$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/include \ + target=../sun4u/include $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-250/include \ target=../sun4u/include -$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/include target=../sun4u/include +$(sparc_ONLY)link path=usr/platform/SUNW,Ultra-4/include \ + target=../sun4u/include $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise-10000/include \ target=../sun4u/include $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-Enterprise/include \ diff --git a/usr/src/pkg/manifests/system-io-tests.mf b/usr/src/pkg/manifests/system-io-tests.mf index 3c273ffc4d..ac11a24fc9 100644 --- a/usr/src/pkg/manifests/system-io-tests.mf +++ b/usr/src/pkg/manifests/system-io-tests.mf @@ -20,7 +20,7 @@ # # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/io/tests@$(PKGVERS) @@ -29,7 +29,6 @@ set name=pkg.summary value="I/O test utilities and drivers" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys diff --git a/usr/src/pkg/manifests/system-ipc.mf b/usr/src/pkg/manifests/system-ipc.mf index aca15786f6..194f7877fa 100644 --- a/usr/src/pkg/manifests/system-ipc.mf +++ b/usr/src/pkg/manifests/system-ipc.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/ipc@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Interprocess Communications" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin file path=usr/bin/ipcrm mode=0555 diff --git a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf b/usr/src/pkg/manifests/system-kernel-cpu-counters.mf index 04781627cc..f8e3eaee62 100644 --- a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf +++ b/usr/src/pkg/manifests/system-kernel-cpu-counters.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/cpu-counters@$(PKGVERS) set name=pkg.description value="Kernel support for CPU Performance Counters" set name=pkg.summary value="CPU Performance Counter driver" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys $(i386_ONLY)dir path=platform/i86pc group=sys $(i386_ONLY)dir path=platform/i86pc/kernel group=sys @@ -58,14 +56,11 @@ $(sparc_ONLY)dir path=platform/sun4v/kernel/sys/$(ARCH64) group=sys driver name=cpc perms="shared 0666 root sys" $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/cpc group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc.conf group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/cpc group=sys -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/cpc.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/cpc.conf group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/cpc group=sys -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/cpc.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/cpc.conf group=sys $(i386_ONLY)hardlink path=platform/i86pc/kernel/sys/$(ARCH64)/cpc \ target=../../drv/$(ARCH64)/cpc $(i386_ONLY)hardlink path=platform/i86pc/kernel/sys/cpc target=../drv/cpc diff --git a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf index 418a0a7c9e..7e277770c0 100644 --- a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf +++ b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/cpu/sun4v@$(PKGVERS) set name=pkg.description value="UltraSPARC-T1 core kernel software" set name=pkg.summary value=UltraSPARC-T1 set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/sun4v group=sys dir path=platform/sun4v/kernel group=sys @@ -44,21 +42,21 @@ dir path=platform/sun4v/kernel/cpu/$(ARCH64) group=sys dir path=platform/sun4v/kernel/pcbe group=sys dir path=platform/sun4v/kernel/pcbe/$(ARCH64) group=sys file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T1 group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2 group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2+ group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T3 group=sys \ - mode=0755 reboot-needed=true -file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T1 group=sys \ - mode=0755 reboot-needed=true -file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2 group=sys \ - mode=0755 reboot-needed=true + mode=0755 +file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T1 \ + group=sys mode=0755 +file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2 \ + group=sys mode=0755 file path=platform/sun4v/kernel/pcbe/$(ARCH64)/pcbe.SUNW,UltraSPARC-T2+ \ - group=sys mode=0755 reboot-needed=true -file path=platform/sun4v/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T3 \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 +file path=platform/sun4v/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T3 group=sys \ + mode=0755 legacy pkg=SUNWust1.v arch=$(ARCH).sun4v category=system \ desc="UltraSPARC-T1 core kernel software" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf index a24e009bb1..5c2dbe1403 100644 --- a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf +++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/dtrace/providers/xdt@$(PKGVERS) set name=pkg.description \ value="DTrace provider for tracing events in the xVM hypervisor" @@ -37,7 +36,6 @@ set name=pkg.summary value="xVM Hypervisor Dynamic Tracing (DTrace) Provider" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/i86xpv group=sys dir path=platform/i86xpv/kernel group=sys @@ -46,7 +44,7 @@ dir path=platform/i86xpv/kernel/drv/$(ARCH64) group=sys driver name=xdt file path=platform/i86xpv/kernel/drv/$(ARCH64)/xdt group=sys file path=platform/i86xpv/kernel/drv/xdt group=sys -file path=platform/i86xpv/kernel/drv/xdt.conf group=sys reboot-needed=false +file path=platform/i86xpv/kernel/drv/xdt.conf group=sys legacy pkg=SUNWxdt arch=$(ARCH) category=system \ desc="DTrace provider for tracing events in the xVM hypervisor" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf index 8479954cfc..afddd5a9cb 100644 --- a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf +++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/dtrace/providers@$(PKGVERS) set name=pkg.description value="Dynamic Tracing (DTrace) Providers" set name=pkg.summary value="DTrace Providers" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -59,21 +57,21 @@ file path=kernel/drv/$(ARCH64)/profile group=sys file path=kernel/drv/$(ARCH64)/sdt group=sys file path=kernel/drv/$(ARCH64)/systrace group=sys $(i386_ONLY)file path=kernel/drv/dcpc group=sys -file path=kernel/drv/dcpc.conf group=sys reboot-needed=false +file path=kernel/drv/dcpc.conf group=sys $(i386_ONLY)file path=kernel/drv/dtrace group=sys -file path=kernel/drv/dtrace.conf group=sys reboot-needed=false +file path=kernel/drv/dtrace.conf group=sys $(i386_ONLY)file path=kernel/drv/fasttrap group=sys -file path=kernel/drv/fasttrap.conf group=sys reboot-needed=false +file path=kernel/drv/fasttrap.conf group=sys $(i386_ONLY)file path=kernel/drv/fbt group=sys -file path=kernel/drv/fbt.conf group=sys reboot-needed=false +file path=kernel/drv/fbt.conf group=sys $(i386_ONLY)file path=kernel/drv/lockstat group=sys -file path=kernel/drv/lockstat.conf group=sys reboot-needed=false +file path=kernel/drv/lockstat.conf group=sys $(i386_ONLY)file path=kernel/drv/profile group=sys -file path=kernel/drv/profile.conf group=sys reboot-needed=false +file path=kernel/drv/profile.conf group=sys $(i386_ONLY)file path=kernel/drv/sdt group=sys -file path=kernel/drv/sdt.conf group=sys reboot-needed=false +file path=kernel/drv/sdt.conf group=sys $(i386_ONLY)file path=kernel/drv/systrace group=sys -file path=kernel/drv/systrace.conf group=sys reboot-needed=false +file path=kernel/drv/systrace.conf group=sys hardlink path=kernel/dtrace/$(ARCH64)/dcpc \ target=../../../kernel/drv/$(ARCH64)/dcpc hardlink path=kernel/dtrace/$(ARCH64)/fasttrap \ @@ -94,7 +92,8 @@ $(i386_ONLY)hardlink path=kernel/dtrace/fasttrap \ $(i386_ONLY)hardlink path=kernel/dtrace/fbt target=../../kernel/drv/fbt $(i386_ONLY)hardlink path=kernel/dtrace/lockstat \ target=../../kernel/drv/lockstat -$(i386_ONLY)hardlink path=kernel/dtrace/profile target=../../kernel/drv/profile +$(i386_ONLY)hardlink path=kernel/dtrace/profile \ + target=../../kernel/drv/profile $(i386_ONLY)hardlink path=kernel/dtrace/sdt target=../../kernel/drv/sdt $(i386_ONLY)hardlink path=kernel/dtrace/systrace \ target=../../kernel/drv/systrace diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf index 2c0773b7b3..924d56e989 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf @@ -24,23 +24,26 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/kernel/dynamic-reconfiguration/i86pc@$(PKGVERS) set name=pkg.description \ - value="Dynamic Reconfiguration Modules for i86pc required to support \ - hotplug on i86pc based systems. Includes the ACPI Hotplug Daemon, SMF \ - manifests/methods and drivers for hotplug operations." + value="Dynamic Reconfiguration Modules for i86pc required to support hotplug on i86pc based systems. Includes the ACPI Hotplug Daemon, SMF manifests/methods and drivers for hotplug operations." set name=pkg.summary value="Dynamic Reconfiguration Modules for i86pc" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/i86pc group=sys +dir path=lib/svc/method dir path=platform group=sys dir path=platform/i86pc group=sys dir path=platform/i86pc/kernel group=sys @@ -48,33 +51,24 @@ dir path=platform/i86pc/kernel/drv group=sys dir path=platform/i86pc/kernel/drv/$(ARCH64) group=sys dir path=platform/i86pc/kernel/misc group=sys dir path=platform/i86pc/kernel/misc/$(ARCH64) group=sys -file path=platform/i86pc/kernel/misc/$(ARCH64)/drmach_acpi group=sys \ - mode=0755 dir path=usr group=sys dir path=usr/platform group=sys dir path=usr/platform/i86pc group=sys dir path=usr/platform/i86pc/lib -file path=platform/i86pc/kernel/drv/$(ARCH64)/dr group=sys +dir path=usr/platform/i86pc/lib/cfgadm +dir path=usr/platform/i86pc/lib/cfgadm/$(ARCH64) driver name=dr alias=acpidr_sbd -file path=platform/i86pc/kernel/drv/dr.conf group=sys mode=0644 -file path=usr/platform/i86pc/lib/acpihpd group=sys mode=0755 -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/platform group=sys -dir path=lib/svc/manifest/platform/i86pc group=sys file path=lib/svc/manifest/platform/i86pc/acpihpd.xml group=sys mode=0444 -dir path=lib/svc/method file path=lib/svc/method/svc-acpihpd mode=0555 -dir path=usr/platform/i86pc/lib/cfgadm -dir path=usr/platform/i86pc/lib/cfgadm/$(ARCH64) -file path=usr/platform/i86pc/lib/cfgadm/sbd.so.1 -link path=usr/platform/i86pc/lib/cfgadm/sbd.so \ - target=./sbd.so.1 +file path=platform/i86pc/kernel/drv/$(ARCH64)/dr group=sys +file path=platform/i86pc/kernel/drv/dr.conf group=sys mode=0644 +file path=platform/i86pc/kernel/misc/$(ARCH64)/drmach_acpi group=sys mode=0755 +file path=usr/platform/i86pc/lib/acpihpd group=sys mode=0755 file path=usr/platform/i86pc/lib/cfgadm/$(ARCH64)/sbd.so.1 -link path=usr/platform/i86pc/lib/cfgadm/$(ARCH64)/sbd.so \ - target=./sbd.so.1 +file path=usr/platform/i86pc/lib/cfgadm/sbd.so.1 license cr_Intel.hotplug license=cr_Intel license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +link path=usr/platform/i86pc/lib/cfgadm/$(ARCH64)/sbd.so target=./sbd.so.1 +link path=usr/platform/i86pc/lib/cfgadm/sbd.so target=./sbd.so.1 depend fmri=pkg:/system/kernel/power type=require diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.mf index 40e3557606..bcaf924b02 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.mf +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-15000.mf @@ -20,25 +20,24 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/kernel/dynamic-reconfiguration/sun-fire-15000@$(PKGVERS) set name=pkg.description \ value="Dynamic Reconfiguration Modules for Sun Fire 15000" -set name=pkg.summary value="Dynamic Reconfiguration Modules for Sun Fire 15000" +set name=pkg.summary \ + value="Dynamic Reconfiguration Modules for Sun Fire 15000" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/SUNW,Sun-Fire-15000 group=sys dir path=platform/SUNW,Sun-Fire-15000/kernel group=sys @@ -47,16 +46,15 @@ dir path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64) group=sys dir path=platform/SUNW,Sun-Fire-15000/kernel/misc group=sys dir path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64) group=sys file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/dr group=sys -file path=platform/SUNW,Sun-Fire-15000/kernel/drv/dr.conf group=sys \ - reboot-needed=false +file path=platform/SUNW,Sun-Fire-15000/kernel/drv/dr.conf group=sys file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/drmach group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/fcgp2 group=sys \ - mode=0755 reboot-needed=true -file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/gptwo_pci group=sys \ - mode=0755 reboot-needed=true + mode=0755 +file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/gptwo_pci \ + group=sys mode=0755 file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/sc_gptwocfg \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 legacy pkg=SUNWdrcr.u arch=$(ARCH).sun4u category=system \ desc="Dynamic Reconfiguration Modules for Sun Fire 15000" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf index d1c6e5de8d..3511bd3f28 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-sun-fire-880.mf @@ -20,10 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/kernel/dynamic-reconfiguration/sun-fire-880@$(PKGVERS) set name=pkg.description value="Sun Fire 880 DR Daemon" @@ -31,27 +36,21 @@ set name=pkg.summary value="Sun Fire 880 DR Daemon" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4u group=sys +dir path=lib/svc/method dir path=usr group=sys dir path=usr/platform group=sys dir path=usr/platform/SUNW,Sun-Fire-880 group=sys dir path=usr/platform/SUNW,Sun-Fire-880/lib dir path=usr/platform/SUNW,Sun-Fire-V890 group=sys dir path=usr/platform/SUNW,Sun-Fire-V890/lib -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/platform/sun4u group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/sf880dr mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=lib/svc/manifest/platform/sun4u/sf880drd.xml group=sys mode=0444 +file path=lib/svc/method/sf880dr mode=0555 file path=usr/platform/SUNW,Sun-Fire-880/lib/sf880drd group=sys mode=0755 -file path=lib/svc/manifest/platform/sun4u/sf880drd.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWsfdr.u arch=$(ARCH).sun4u category=system \ desc="Sun Fire 880 DR Daemon" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.mf b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.mf index f100383d17..d93512c6eb 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.mf +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-ultra-enterprise-10000.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/kernel/dynamic-reconfiguration/ultra-enterprise-10000@$(PKGVERS) set name=pkg.description \ @@ -39,7 +38,6 @@ set name=pkg.summary \ set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/SUNW,Ultra-Enterprise-10000 group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/kernel group=sys @@ -52,9 +50,9 @@ file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64)/ngdr \ group=sys file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/ngdr.conf group=sys \ original_name=SUNWdrr:platform/SUNW,Ultra-Enterprise-10000/kernel/drv/ngdr.conf \ - preserve=true reboot-needed=false + preserve=true file path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc/$(ARCH64)/ngdrmach \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 legacy pkg=SUNWdrr.u arch=$(ARCH).sun4u category=system \ desc="Dynamic Reconfiguration Modules for Sun Enterprise 10000" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.mf b/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.mf index 4d6ef8c0a0..8e67cb73d3 100644 --- a/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.mf +++ b/usr/src/pkg/manifests/system-kernel-inter-domain-ultra-enterprise-10000.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri \ value=pkg:/system/kernel/inter-domain/ultra-enterprise-10000@$(PKGVERS) set name=pkg.description \ @@ -39,7 +38,6 @@ set name=pkg.summary \ set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/SUNW,Ultra-Enterprise-10000 group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/kernel group=sys @@ -50,7 +48,7 @@ file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64)/idn \ group=sys file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/idn.conf group=sys \ original_name=SUNWidn:platform/SUNW,Ultra-Enterprise-10000/kernel/drv/idn.conf \ - preserve=true reboot-needed=false + preserve=true legacy pkg=SUNWidn.u arch=$(ARCH).sun4u category=system \ desc="Inter-Domain Network Modules for Sun Enterprise 10000" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf b/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf index 594344ae67..ccf0ae0f15 100644 --- a/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf +++ b/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/io-performance-counters@$(PKGVERS) -set name=pkg.description value="Kernel support for IO chip performance counters" +set name=pkg.description \ + value="Kernel support for IO chip performance counters" set name=pkg.summary value="sun4u IO chip performance counter modules" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/SUNW,A70 group=sys dir path=platform/SUNW,A70/kernel group=sys @@ -61,13 +60,13 @@ driver name=n2piupc perms="* 0666 root sys" \ alias=SUNW,n2piu-pr \ alias=SUNW,vfpiu-pr file path=platform/SUNW,A70/kernel/drv/$(ARCH64)/fpc group=sys -file path=platform/SUNW,A70/kernel/drv/fpc.conf group=sys reboot-needed=false +file path=platform/SUNW,A70/kernel/drv/fpc.conf group=sys file path=platform/sun4v/kernel/drv/$(ARCH64)/fpc group=sys file path=platform/sun4v/kernel/drv/$(ARCH64)/iospc group=sys file path=platform/sun4v/kernel/drv/$(ARCH64)/n2piupc group=sys -file path=platform/sun4v/kernel/drv/fpc.conf group=sys reboot-needed=false -file path=platform/sun4v/kernel/drv/iospc.conf group=sys reboot-needed=false -file path=platform/sun4v/kernel/drv/n2piupc.conf group=sys reboot-needed=false +file path=platform/sun4v/kernel/drv/fpc.conf group=sys +file path=platform/sun4v/kernel/drv/iospc.conf group=sys +file path=platform/sun4v/kernel/drv/n2piupc.conf group=sys legacy pkg=SUNWiopc.u arch=$(ARCH).sun4u category=system \ desc="Kernel support for IO chip performance counters" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-platform-netra.mf b/usr/src/pkg/manifests/system-kernel-platform-netra.mf index 30cfb99724..647117ecd3 100644 --- a/usr/src/pkg/manifests/system-kernel-platform-netra.mf +++ b/usr/src/pkg/manifests/system-kernel-platform-netra.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/platform/netra@$(PKGVERS) set name=pkg.description \ value="I2C and System Controller and Status Drivers for Netra ct cPCI platform" set name=pkg.summary value="Netra ct I2C and System Drivers" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys dir path=platform/SUNW,Netra-CP2300 group=sys dir path=platform/SUNW,Netra-CP2300/kernel group=sys @@ -46,13 +44,16 @@ dir path=platform/SUNW,Netra-CP2300/kernel/drv group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40 group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/dacf group=sys -dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/dacf/$(ARCH64) group=sys +dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/dacf/$(ARCH64) \ + group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv group=sys -dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/$(ARCH64) group=sys +dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/$(ARCH64) \ + group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/dacf group=sys -dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/dacf/$(ARCH64) group=sys +dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/dacf/$(ARCH64) \ + group=sys dir path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/kernel/drv group=sys dir path=platform/SUNW,UltraSPARC-IIi-Netract group=sys dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel group=sys @@ -63,9 +64,10 @@ dir path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64) group=sys driver name=acebus driver name=scsb alias=nct-ATML,at27c64 file path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/kernel/drv/acebus.conf \ - group=sys reboot-needed=false -file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64)/ttymux_dacf \ - group=sys reboot-needed=true + group=sys +file \ + path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/dacf/$(ARCH64)/ttymux_dacf \ + group=sys file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/acebus \ group=sys file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/pcf8574 \ @@ -74,12 +76,10 @@ file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/pcf8591 \ group=sys file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/$(ARCH64)/scsb \ group=sys -file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/scsb.conf group=sys \ - reboot-needed=false -file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/se.conf group=sys \ - reboot-needed=false -file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/ttymux.conf group=sys \ - reboot-needed=false +file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/scsb.conf group=sys +file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/se.conf group=sys +file path=platform/SUNW,UltraSPARC-IIi-Netract/kernel/drv/ttymux.conf \ + group=sys legacy pkg=SUNWcti2.u arch=$(ARCH).sun4u category=system \ desc="I2C and System Controller and Status Drivers for Netra ct cPCI platform" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.mf index e6d1357d71..d33bcdd306 100644 --- a/usr/src/pkg/manifests/system-kernel-platform.mf +++ b/usr/src/pkg/manifests/system-kernel-platform.mf @@ -20,23 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/platform@$(PKGVERS) set name=pkg.description \ value="core kernel software for a specific hardware platform group" set name=pkg.summary value="Core Solaris Kernel Architecture" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=platform group=sys $(sparc_ONLY)dir path=platform/SUNW,A70 group=sys $(sparc_ONLY)dir path=platform/SUNW,A70/kernel group=sys @@ -48,20 +46,24 @@ $(sparc_ONLY)dir path=platform/SUNW,A70/kernel/misc/$(ARCH64) group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300 group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/misc group=sys -$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/misc/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/misc/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/tod group=sys -$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/tod/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Netra-CP2300/kernel/tod/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010 group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/crypto group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/crypto/$(ARCH64) \ group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/misc group=sys -$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12 group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/crypto group=sys -$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/crypto/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/crypto/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/drv group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64) group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/kernel/misc group=sys @@ -76,7 +78,8 @@ $(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/misc group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T4/kernel/misc/$(ARCH64) group=sys $(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise group=sys $(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel group=sys -$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/cpu group=sys $(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/cpu/$(ARCH64) \ group=sys @@ -92,13 +95,16 @@ $(sparc_ONLY)dir path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64) \ $(sparc_ONLY)dir path=platform/SUNW,Serverblade1 group=sys $(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel/misc group=sys -$(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel/misc/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Serverblade1/kernel/misc/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100 group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/misc group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Blade-100/kernel/misc/$(ARCH64) \ group=sys @@ -153,7 +159,8 @@ $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/crypto group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/crypto/$(ARCH64) \ group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/misc group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64) \ group=sys @@ -171,13 +178,16 @@ $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/crypto group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/crypto/$(ARCH64) \ group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/misc group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200 group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215 group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V215/kernel/crypto group=sys @@ -193,7 +203,8 @@ $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/crypto group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/crypto/$(ARCH64) \ group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/misc group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V240/kernel/misc/$(ARCH64) \ group=sys @@ -211,7 +222,8 @@ $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/crypto group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/crypto/$(ARCH64) \ group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/misc group=sys $(sparc_ONLY)dir path=platform/SUNW,Sun-Fire-V440/kernel/misc/$(ARCH64) \ group=sys @@ -258,15 +270,18 @@ $(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000 group=sys $(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/$(ARCH64) \ group=sys -$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/cpu group=sys -$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/cpu/$(ARCH64) \ +$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/cpu \ group=sys -$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv group=sys -$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64) \ +$(sparc_ONLY)dir \ + path=platform/SUNW,Ultra-Enterprise-10000/kernel/cpu/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv \ group=sys -$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc group=sys -$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc/$(ARCH64) \ +$(sparc_ONLY)dir \ + path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc \ group=sys +$(sparc_ONLY)dir \ + path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc/$(ARCH64) group=sys $(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel/drv group=sys $(sparc_ONLY)dir path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64) \ @@ -540,16 +555,18 @@ $(i386_ONLY)driver name=xpvtap perms="* 0666 root sys" $(sparc_ONLY)driver name=zs perms="[a-z] 0666 root sys" \ perms="[a-z],cu 0600 uucp uucp" $(sparc_ONLY)driver name=zsh perms="* 0666 root sys" -$(sparc_ONLY)file path=platform/SUNW,A70/kernel/drv/ppm.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,A70/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Netra-CP2300/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Netra-CP2300/kernel/tod/$(ARCH64)/todds1307 \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true +$(sparc_ONLY)file path=platform/SUNW,A70/kernel/drv/ppm.conf group=sys +$(sparc_ONLY)file path=platform/SUNW,A70/kernel/misc/$(ARCH64)/platmod \ + group=sys mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Netra-CP2300/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Netra-CP2300/kernel/tod/$(ARCH64)/todds1307 group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Netra-CP3010/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/lw8 \ group=sys $(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/ntwdt \ @@ -558,25 +575,20 @@ $(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/sgenv \ group=sys $(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/$(ARCH64)/sgfru \ group=sys -$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/lw8.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/ntwdt.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/sgenv.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/sgfru.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/lw8.conf group=sys +$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/ntwdt.conf group=sys +$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/sgenv.conf group=sys +$(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/drv/sgfru.conf group=sys $(sparc_ONLY)file path=platform/SUNW,Netra-T12/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/$(ARCH64)/lombus \ group=sys -$(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/lombus.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/lombus.conf group=sys $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/$(ARCH64)/unix \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,SPARC-Enterprise/kernel/cpu/$(ARCH64)/FJSV,SPARC64-VI \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/dr \ group=sys $(sparc_ONLY)file \ @@ -584,168 +596,181 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file \ path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplmsu group=sys $(sparc_ONLY)file \ - path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplpanel group=sys + path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplpanel \ + group=sys $(sparc_ONLY)file \ path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/pcicmu group=sys -$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/scfd \ - group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/scfd group=sys $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/dr.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/mc-opl.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/oplpanel.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/options.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/scfd.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file \ - path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/drmach group=sys \ - mode=0755 reboot-needed=true + path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/drmach \ + group=sys mode=0755 $(sparc_ONLY)file \ - path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/platmod \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/drv/$(ARCH64)/bscbus \ group=sys $(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/drv/$(ARCH64)/bscv \ group=sys $(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/drv/bscbus.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/drv/bscv.conf group=sys \ - reboot-needed=false + group=sys +$(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/drv/bscv.conf \ + group=sys $(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/drv/options.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Serverblade1/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Serverblade1/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64)/grfans \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/drv/$(ARCH64)/grppm \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/drv/grppm.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-100/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalppm \ - group=sys -$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalwd \ group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Blade-100/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalppm group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalwd group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/xcalppm.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/xcalwd.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file \ path=platform/SUNW,Sun-Blade-1000/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1500/kernel/drv/ppm.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file \ path=platform/SUNW,Sun-Blade-1500/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Blade-2500/kernel/drv/ppm.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file \ path=platform/SUNW,Sun-Blade-2500/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/$(ARCH64)/unix \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Sun-Fire-15000/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Sun-Fire-15000/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III+ \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/axq \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/dman \ group=sys -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/iosram \ - group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/iosram group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/schpc \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/drv/dman.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/drv/schpc.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/mboxsc \ - group=sys mode=0755 reboot-needed=true + group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/mboxsc group=sys \ + mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/scosmb \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64)/pcf8574 \ - group=sys -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-480R/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-15000/kernel/misc/$(ARCH64)/scosmb group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64)/pcf8574 group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-480R/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/drv/$(ARCH64)/hpc3130 \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/drv/hpc3130.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64)/tsalarm \ group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64)/tsalarm group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-T200/kernel/drv/tsalarm.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V215/kernel/drv/su.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V215/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/ntwdt \ group=sys -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm \ +$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V215/kernel/drv/su.conf \ + group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-V215/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/ntwdt \ group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/ntwdt.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/tsalarm.conf \ - group=sys reboot-needed=false -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V250/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V440/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V445/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-V240/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-V250/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-V440/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-V445/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/$(ARCH64)/unix group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III+ \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sgcn \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sghsc \ group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/sgsbbc \ group=sys -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/ssm group=sys -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/sghsc.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/$(ARCH64)/ssm \ + group=sys +$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/drv/sghsc.conf group=sys $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64)/sbdp \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Ultra-250/kernel/drv/$(ARCH64)/envctrltwo \ group=sys $(sparc_ONLY)file path=platform/SUNW,Ultra-250/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Ultra-4/kernel/drv/$(ARCH64)/envctrl \ group=sys $(sparc_ONLY)file path=platform/SUNW,Ultra-4/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Ultra-5_10/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Ultra-Enterprise-10000/kernel/$(ARCH64)/unix group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Ultra-Enterprise-10000/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-II \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file \ path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64)/pcipsy \ group=sys @@ -757,55 +782,59 @@ $(sparc_ONLY)file \ group=sys $(sparc_ONLY)file \ path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/ac \ group=sys $(sparc_ONLY)file \ - path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/central group=sys + path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/central \ + group=sys $(sparc_ONLY)file \ - path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/environ group=sys + path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/environ \ + group=sys $(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/fhc \ group=sys $(sparc_ONLY)file \ - path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/simmstat group=sys -$(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/sram \ + path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/simmstat \ group=sys $(sparc_ONLY)file \ - path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/sysctrl group=sys + path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/sram group=sys +$(sparc_ONLY)file \ + path=platform/SUNW,Ultra-Enterprise/kernel/drv/$(ARCH64)/sysctrl \ + group=sys $(sparc_ONLY)file path=platform/SUNW,Ultra-Enterprise/kernel/drv/fhc.conf \ - group=sys reboot-needed=false + group=sys $(sparc_ONLY)file \ - path=platform/SUNW,Ultra-Enterprise/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + path=platform/SUNW,Ultra-Enterprise/kernel/misc/$(ARCH64)/platmod \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/SUNW,UltraAX-i2/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/$(ARCH64)/unix group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu.generic group=sys \ - mode=0755 reboot-needed=true + group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/$(ARCH64)/unix group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu.generic \ + group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD \ - group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD.15 \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 +$(i386_ONLY)file \ + path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD.15 group=sys \ + mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file \ - path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.46 group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu.generic group=sys mode=0755 \ - reboot-needed=true + path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.46 \ + group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu.generic group=sys \ + mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD.15 group=sys \ - mode=0755 reboot-needed=true + mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD.15 \ + group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46 \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/dacf/$(ARCH64)/consconfig_dacf \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/dacf/consconfig_dacf group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/acpinex group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/acpippm group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/amd_iommu group=sys @@ -818,42 +847,33 @@ $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/ppm group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/rootnex group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/acpinex group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/acpippm group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/acpippm.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86pc/kernel/drv/acpippm.conf group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/amd_iommu group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/amd_iommu.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86pc/kernel/drv/amd_iommu.conf group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/cpudrv group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/isa group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/npe group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/pci group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/pit_beep group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/pit_beep.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86pc/kernel/drv/pit_beep.conf group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm.conf group=sys $(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex.conf group=sys $(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/pcplusmp group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/uppc group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/mach/pcplusmp group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/mach/uppc group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/mach/pcplusmp group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/mach/uppc group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/acpidev group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/gfx_private group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/misc/acpidev group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/misc/gfx_private group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/unix group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/gfx_private \ + group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/misc/acpidev group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/misc/gfx_private group=sys \ + mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/unix group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/multiboot group=sys mode=0755 \ reboot-needed=true $(i386_ONLY)file path=platform/i86pc/ucode/amd-ucode.bin group=sys mode=0444 \ @@ -862,29 +882,29 @@ $(i386_ONLY)file path=platform/i86pc/ucode/amd-ucode.bin group=sys mode=0444 \ $(i386_ONLY)file path=platform/i86pc/ucode/intel-ucode.txt group=sys mode=0444 \ original_name=SUNWcakr:platform/i86pc/ucode/intel-ucode.txt preserve=true \ reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/$(ARCH64)/unix group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu.generic group=sys \ - mode=0755 reboot-needed=true +$(i386_ONLY)file path=platform/i86xpv/kernel/$(ARCH64)/unix group=sys \ + mode=0755 +$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu.generic \ + group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file \ - path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD.15 group=sys \ - mode=0755 reboot-needed=true + path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD.15 \ + group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \ - group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu.generic group=sys mode=0755 \ - reboot-needed=true + group=sys mode=0755 +$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu.generic group=sys \ + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu_ms.AuthenticAMD group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu_ms.AuthenticAMD.15 \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu_ms.GenuineIntel group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/dacf/$(ARCH64)/consconfig_dacf \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/dacf/consconfig_dacf group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/balloon group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/domcaps group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/evtchn group=sys @@ -911,68 +931,65 @@ $(i386_ONLY)file path=platform/i86xpv/kernel/drv/isa group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/npe group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/pci group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/pit_beep group=sys -$(i386_ONLY)file path=platform/i86xpv/kernel/drv/pit_beep.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86xpv/kernel/drv/pit_beep.conf group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/privcmd group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/rootnex group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/xdf group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/xenbus group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/xencons group=sys -$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xencons.conf group=sys \ - reboot-needed=false +$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xencons.conf group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/xnf group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/drv/xpvd group=sys $(i386_ONLY)file path=platform/i86xpv/kernel/mach/$(ARCH64)/xpv_psm group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/mach/$(ARCH64)/xpv_uppc group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/mach/xpv_psm group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/mach/xpv_uppc group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(i386_ONLY)file path=platform/i86xpv/kernel/mach/xpv_psm group=sys mode=0755 +$(i386_ONLY)file path=platform/i86xpv/kernel/mach/xpv_uppc group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/gfx_private \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/xnb group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/xpv_autoconfig \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/misc/gfx_private group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/misc/xpv_autoconfig group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=platform/i86xpv/kernel/tod/$(ARCH64)/xpvtod group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/tod/xpvtod group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=platform/i86xpv/kernel/unix group=sys mode=0755 \ - reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u-us3/kernel/crypto/$(ARCH64)/aes group=sys \ - mode=0755 reboot-needed=true + mode=0755 +$(i386_ONLY)file path=platform/i86xpv/kernel/tod/xpvtod group=sys mode=0755 +$(i386_ONLY)file path=platform/i86xpv/kernel/unix group=sys mode=0755 +$(sparc_ONLY)file path=platform/sun4u-us3/kernel/crypto/$(ARCH64)/aes \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/bootlst group=sys reboot-needed=true $(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/genunix group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/unix group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/unix group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-II \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III+ \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIIi \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIIi+ \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 +$(sparc_ONLY)file \ + path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III+ group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIIi group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIIi+ group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IIe \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/arcfour group=sys \ - mode=0755 reboot-needed=true + group=sys mode=0755 +$(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/arcfour \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/des group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/md5 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/crypto/$(ARCH64)/sha1 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/adm1026 group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/adm1031 group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/bbc_beep group=sys @@ -981,7 +998,8 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/db21554 group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ebus group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/epic group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/fd group=sys -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/gpio_87317 group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/gpio_87317 \ + group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/grbeep group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/i2bsc group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/ics951601 group=sys @@ -1029,84 +1047,76 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/trapstat group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/upa64s group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/zs group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/zsh group=sys -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/i2bsc.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/mem_cache.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmc_comm.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmcadm.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmclomv.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/sbusmem.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/trapstat.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/zsh.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/i2bsc.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/mem_cache.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmc_comm.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmcadm.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/rmclomv.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/sbusmem.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/trapstat.conf group=sys +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/zsh.conf group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/bignum group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/bootdev group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/forthdebug group=sys \ - mode=0755 reboot-needed=true + mode=0755 +$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/forthdebug \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/i2c_svc group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/kmdbmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/obpsym group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/opl_cfg group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/pcie group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/sbd group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/vis group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/zuluvm group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/strmod/$(ARCH64)/kb group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todblade group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todbq4802 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todds1287 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todds1337 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todm5819 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todm5819p_rmc \ - group=sys mode=0755 reboot-needed=true + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todm5823 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todmostek group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todopl group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todsg group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todstarcat group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todstarfire group=sys \ - mode=0755 reboot-needed=true + mode=0755 +$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todstarcat \ + group=sys mode=0755 +$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todstarfire \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/wanboot group=sys reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/bootlst group=sys reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/genunix group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/unix group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/unix group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/cpu/$(ARCH64)/generic group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/kernel/crypto/$(ARCH64)/arcfour group=sys \ - mode=0755 reboot-needed=true + mode=0755 +$(sparc_ONLY)file path=platform/sun4v/kernel/crypto/$(ARCH64)/arcfour \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/crypto/$(ARCH64)/md5 group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/bge group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/bmc group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/ebus group=sys @@ -1121,34 +1131,27 @@ $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/rootnex group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/su group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/trapstat group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/vnex group=sys -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/bge.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/bmc.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/mdesc.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/n2rng.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/ncp.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/ntwdt.conf group=sys \ - reboot-needed=false -$(sparc_ONLY)file path=platform/sun4v/kernel/drv/trapstat.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/bge.conf group=sys +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/bmc.conf group=sys +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/mdesc.conf group=sys +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/n2rng.conf group=sys +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/ncp.conf group=sys +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/ntwdt.conf group=sys +$(sparc_ONLY)file path=platform/sun4v/kernel/drv/trapstat.conf group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/bootdev group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/forthdebug group=sys \ - mode=0755 reboot-needed=true + mode=0755 +$(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/forthdebug \ + group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/kmdbmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/obpsym group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/pcie group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/platmod group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/vis group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(sparc_ONLY)file path=platform/sun4v/wanboot group=sys reboot-needed=true $(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/md5 \ target=../../../kernel/crypto/$(ARCH64)/md5 @@ -1214,11 +1217,14 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=platform/SUNW,SPARC-Enterprise/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1000/kernel/crypto/$(ARCH64)/aes \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-1000/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1500/kernel/crypto/$(ARCH64)/aes \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-1500/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-2500/kernel/crypto/$(ARCH64)/aes \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-2500/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes $(sparc_ONLY)link \ path=platform/SUNW,Sun-Fire-15000/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV \ @@ -1226,7 +1232,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=platform/SUNW,Sun-Fire-15000/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV+ \ target=SUNW,UltraSPARC-III+ -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-15000/kernel/crypto/$(ARCH64)/aes \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-15000/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-280R/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes @@ -1244,7 +1251,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64)/ntwdt \ target=../../../../SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/ntwdt -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64)/tsalarm \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-V440/kernel/drv/$(ARCH64)/tsalarm \ target=../../../../SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/kernel/drv/ntwdt.conf \ target=../../../SUNW,Sun-Fire-V240/kernel/drv/ntwdt.conf @@ -1273,5 +1281,6 @@ $(sparc_ONLY)link path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-IV+ \ $(sparc_ONLY)link path=platform/sun4u/kernel/misc/$(ARCH64)/des \ target=../../../kernel/crypto/$(ARCH64)/des $(sparc_ONLY)link path=platform/sun4u/kernel/unix target=$(ARCH64)/unix -$(sparc_ONLY)link path=platform/sun4v/kernel/cpu/$(ARCH64)/sun4v target=generic +$(sparc_ONLY)link path=platform/sun4v/kernel/cpu/$(ARCH64)/sun4v \ + target=generic $(sparc_ONLY)link path=platform/sun4v/kernel/unix target=$(ARCH64)/unix diff --git a/usr/src/pkg/manifests/system-kernel-power.mf b/usr/src/pkg/manifests/system-kernel-power.mf index b3561a289f..301273701a 100644 --- a/usr/src/pkg/manifests/system-kernel-power.mf +++ b/usr/src/pkg/manifests/system-kernel-power.mf @@ -20,23 +20,28 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/power@$(PKGVERS) set name=pkg.description value="Power Management binaries" set name=pkg.summary value="Power Management binaries" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/default group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/default group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/method dir path=usr group=sys dir path=usr/bin dir path=usr/kernel group=sys @@ -45,18 +50,12 @@ dir path=usr/kernel/drv/$(ARCH64) group=sys dir path=usr/lib dir path=usr/lib/power group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=pm perms="* 0666 root sys" -file path=etc/default/power group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=etc/power.conf group=sys opensolaris.zone=global \ - original_name=SUNWpm:etc/power.conf preserve=true \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-power mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=etc/default/power group=sys +file path=etc/power.conf group=sys original_name=SUNWpm:etc/power.conf \ + preserve=true +file path=lib/svc/manifest/system/power.xml group=sys mode=0444 +file path=lib/svc/method/svc-power mode=0555 file path=usr/bin/sys-suspend mode=4555 file path=usr/kernel/drv/$(ARCH64)/pm group=sys $(i386_ONLY)file path=usr/kernel/drv/pm group=sys @@ -64,14 +63,13 @@ file path=usr/kernel/drv/pm.conf group=sys file path=usr/lib/power/powerd mode=0555 file path=usr/sbin/pmconfig mode=4555 file path=usr/sbin/sysidpm group=sys mode=0755 -file path=lib/svc/manifest/system/power.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWpmr arch=$(ARCH) category=system \ desc="Power Management config file and rc script" \ hotline="Please contact your local service provider" \ name="Power Management config file and rc script" \ vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWpmu arch=$(ARCH) category=system desc="Power Management binaries" \ +legacy pkg=SUNWpmu arch=$(ARCH) category=system \ + desc="Power Management binaries" \ hotline="Please contact your local service provider" \ name="Power Management binaries" vendor="Sun Microsystems, Inc." \ version=11.11,REV=2009.11.11 diff --git a/usr/src/pkg/manifests/system-kernel-rsmops.mf b/usr/src/pkg/manifests/system-kernel-rsmops.mf index 3e2967ce65..b137f79062 100644 --- a/usr/src/pkg/manifests/system-kernel-rsmops.mf +++ b/usr/src/pkg/manifests/system-kernel-rsmops.mf @@ -20,32 +20,31 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/rsmops@$(PKGVERS) set name=pkg.description \ value="Support for network specific implementations of RSMPI" set name=pkg.summary value="RSMPI Operations Registration Module" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/rsmops group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/rsmops group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/rsmops group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/rsmops group=sys mode=0755 legacy pkg=SUNWrsmo arch=$(ARCH) category=system \ desc="Support for network specific implementations of RSMPI" \ hotline="Please contact your local service provider" \ - name="RSMPI Operations Registration Module" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="RSMPI Operations Registration Module" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf b/usr/src/pkg/manifests/system-kernel-secure-rpc.mf index 3a4b9da76a..c5a30bf964 100644 --- a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf +++ b/usr/src/pkg/manifests/system-kernel-secure-rpc.mf @@ -20,29 +20,25 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/secure-rpc@$(PKGVERS) set name=pkg.description value="kernel GSS-API services for ONC RPC" set name=pkg.summary value="kernel RPCSEC_GSS" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/rpcsec_gss group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/rpcsec_gss group=sys mode=0755 \ - reboot-needed=true +file path=kernel/misc/$(ARCH64)/rpcsec_gss group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/rpcsec_gss group=sys mode=0755 legacy pkg=SUNWrsgk arch=$(ARCH) category=system \ desc="kernel GSS-API services for ONC RPC" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-security-gss.mf b/usr/src/pkg/manifests/system-kernel-security-gss.mf index 8cd51db1cb..b7175a7b8d 100644 --- a/usr/src/pkg/manifests/system-kernel-security-gss.mf +++ b/usr/src/pkg/manifests/system-kernel-security-gss.mf @@ -20,34 +20,31 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/security/gss@$(PKGVERS) set name=pkg.description \ value="Generic Security Service Application Program Interface, Version 2 - kernel" set name=pkg.summary value="kernel GSSAPI V2" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys dir path=kernel/misc/kgss group=sys dir path=kernel/misc/kgss/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/kgssapi group=sys mode=0755 reboot-needed=true -file path=kernel/misc/kgss/$(ARCH64)/kmech_krb5 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/kgss/kmech_krb5 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/kgssapi group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/kgssapi group=sys mode=0755 +file path=kernel/misc/kgss/$(ARCH64)/kmech_krb5 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/kgss/kmech_krb5 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/kgssapi group=sys mode=0755 legacy pkg=SUNWgssk arch=$(ARCH) category=system \ desc="Generic Security Service Application Program Interface, Version 2 - kernel" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf b/usr/src/pkg/manifests/system-kernel-suspend-resume.mf index 03ad758d19..41e9628bc0 100644 --- a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf +++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.mf @@ -20,22 +20,21 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/suspend-resume@$(PKGVERS) set name=pkg.description value="Suspend, Resume package" set name=pkg.summary value="Suspend, Resume package" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(i386_ONLY)dir path=kernel group=sys $(i386_ONLY)dir path=kernel/drv group=sys $(i386_ONLY)dir path=kernel/drv/$(ARCH64) group=sys @@ -53,17 +52,15 @@ $(sparc_ONLY)dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys $(i386_ONLY)driver name=srn $(i386_ONLY)file path=kernel/drv/$(ARCH64)/srn group=sys $(i386_ONLY)file path=kernel/drv/srn group=sys -$(i386_ONLY)file path=kernel/drv/srn.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/srn.conf group=sys $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/cpr group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/kernel/misc/cpr group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/misc/cpr group=sys mode=0755 $(sparc_ONLY)file path=platform/sun4u/cprboot group=sys reboot-needed=true $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/tod group=sys -$(sparc_ONLY)file path=platform/sun4u/kernel/drv/tod.conf group=sys \ - reboot-needed=false +$(sparc_ONLY)file path=platform/sun4u/kernel/drv/tod.conf group=sys $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/cpr group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)legacy pkg=SUNWcpr.i arch=$(ARCH).i86pc category=system \ desc="Suspend, Resume package" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf b/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf index 9491975434..5f9a6a702a 100644 --- a/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf +++ b/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf @@ -20,31 +20,30 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel/ultra-wideband@$(PKGVERS) set name=pkg.description value="Common framework for UWB device drivers" set name=pkg.summary value="Ultra Wideband (UWB) support modules" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys -file path=kernel/misc/$(ARCH64)/uwba group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/uwba group=sys mode=0755 reboot-needed=true +file path=kernel/misc/$(ARCH64)/uwba group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/uwba group=sys mode=0755 legacy pkg=SUNWuwb arch=$(ARCH) category=system \ desc="Common framework for UWB device drivers" \ hotline="Please contact your local service provider" \ - name="Ultra Wideband (UWB) support modules" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Ultra Wideband (UWB) support modules" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf index a444c1788c..ea8725e278 100644 --- a/usr/src/pkg/manifests/system-kernel.mf +++ b/usr/src/pkg/manifests/system-kernel.mf @@ -24,18 +24,17 @@ # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/kernel@$(PKGVERS) set name=pkg.description \ value="core kernel software for a specific instruction-set architecture" set name=pkg.summary value="Core Solaris Kernel" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=boot group=sys $(i386_ONLY)dir path=boot/acpi group=sys $(i386_ONLY)dir path=boot/acpi/tables group=sys @@ -75,9 +74,9 @@ dir path=kernel/sys group=sys dir path=kernel/sys/$(ARCH64) group=sys dir path=lib dir path=lib/svc -dir path=lib/svc/method dir path=lib/svc/manifest group=sys dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/method $(i386_ONLY)driver name=acpi_drv perms="* 0666 root sys" driver name=aggr perms="* 0666 root sys" driver name=arp perms="arp 0666 root sys" @@ -264,42 +263,36 @@ file path=boot/solaris/filelist.ramdisk group=sys file path=boot/solaris/filelist.safe group=sys file path=etc/crypto/kcf.conf group=sys \ original_name=SUNWckr:etc/crypto/kcf.conf preserve=true -file path=etc/name_to_sysnum group=sys original_name=SUNWckr:etc/name_to_sysnum \ - preserve=renameold +file path=etc/name_to_sysnum group=sys \ + original_name=SUNWckr:etc/name_to_sysnum preserve=renameold file path=etc/system group=sys original_name=SUNWckr:etc/system preserve=true -$(i386_ONLY)file path=kernel/$(ARCH64)/genunix group=sys mode=0755 \ - reboot-needed=true -file path=kernel/crypto/$(ARCH64)/aes group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/arcfour group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/blowfish group=sys mode=0755 \ - reboot-needed=true -file path=kernel/crypto/$(ARCH64)/des group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/ecc group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/md4 group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/md5 group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/rsa group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/sha1 group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/sha2 group=sys mode=0755 reboot-needed=true -file path=kernel/crypto/$(ARCH64)/swrand group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/aes group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/arcfour group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/blowfish group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/des group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/ecc group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/md4 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/md5 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/rsa group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/sha1 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/sha2 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/crypto/swrand group=sys mode=0755 \ - reboot-needed=true -$(sparc_ONLY)file path=kernel/dacf/$(ARCH64)/consconfig_dacf group=sys mode=0755 \ - reboot-needed=true -file path=kernel/dacf/$(ARCH64)/net_dacf group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/dacf/net_dacf group=sys mode=0755 \ - reboot-needed=true +$(i386_ONLY)file path=kernel/$(ARCH64)/genunix group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/aes group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/arcfour group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/blowfish group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/des group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/ecc group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/md4 group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/md5 group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/rsa group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/sha1 group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/sha2 group=sys mode=0755 +file path=kernel/crypto/$(ARCH64)/swrand group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/aes group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/arcfour group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/blowfish group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/des group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/ecc group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/md4 group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/md5 group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/rsa group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/sha1 group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/sha2 group=sys mode=0755 +$(i386_ONLY)file path=kernel/crypto/swrand group=sys mode=0755 +$(sparc_ONLY)file path=kernel/dacf/$(ARCH64)/consconfig_dacf group=sys \ + mode=0755 +file path=kernel/dacf/$(ARCH64)/net_dacf group=sys mode=0755 +$(i386_ONLY)file path=kernel/dacf/net_dacf group=sys mode=0755 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/acpi_drv group=sys $(i386_ONLY)file path=kernel/drv/$(ARCH64)/acpi_toshiba group=sys file path=kernel/drv/$(ARCH64)/aggr group=sys @@ -385,465 +378,405 @@ $(i386_ONLY)file path=kernel/drv/$(ARCH64)/vgatext group=sys file path=kernel/drv/$(ARCH64)/vnic group=sys file path=kernel/drv/$(ARCH64)/wc group=sys $(i386_ONLY)file path=kernel/drv/acpi_drv group=sys -$(i386_ONLY)file path=kernel/drv/acpi_drv.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/acpi_drv.conf group=sys $(i386_ONLY)file path=kernel/drv/acpi_toshiba group=sys $(i386_ONLY)file path=kernel/drv/aggr group=sys -file path=kernel/drv/aggr.conf group=sys reboot-needed=false +file path=kernel/drv/aggr.conf group=sys $(i386_ONLY)file path=kernel/drv/arp group=sys -file path=kernel/drv/arp.conf group=sys reboot-needed=false +file path=kernel/drv/arp.conf group=sys $(i386_ONLY)file path=kernel/drv/bl group=sys -file path=kernel/drv/bl.conf group=sys reboot-needed=false +file path=kernel/drv/bl.conf group=sys $(i386_ONLY)file path=kernel/drv/bridge group=sys -file path=kernel/drv/bridge.conf group=sys reboot-needed=false +file path=kernel/drv/bridge.conf group=sys $(i386_ONLY)file path=kernel/drv/bscbus group=sys -$(i386_ONLY)file path=kernel/drv/bscbus.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/bscbus.conf group=sys $(i386_ONLY)file path=kernel/drv/bscv group=sys -$(i386_ONLY)file path=kernel/drv/bscv.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/bscv.conf group=sys $(i386_ONLY)file path=kernel/drv/clone group=sys -file path=kernel/drv/clone.conf group=sys reboot-needed=false +file path=kernel/drv/clone.conf group=sys $(i386_ONLY)file path=kernel/drv/cn group=sys -file path=kernel/drv/cn.conf group=sys reboot-needed=false +file path=kernel/drv/cn.conf group=sys $(i386_ONLY)file path=kernel/drv/conskbd group=sys -file path=kernel/drv/conskbd.conf group=sys reboot-needed=false +file path=kernel/drv/conskbd.conf group=sys $(i386_ONLY)file path=kernel/drv/consms group=sys -file path=kernel/drv/consms.conf group=sys reboot-needed=false +file path=kernel/drv/consms.conf group=sys $(i386_ONLY)file path=kernel/drv/cpuid group=sys -file path=kernel/drv/cpuid.conf group=sys reboot-needed=false +file path=kernel/drv/cpuid.conf group=sys $(i386_ONLY)file path=kernel/drv/cpunex group=sys $(i386_ONLY)file path=kernel/drv/crypto group=sys -file path=kernel/drv/crypto.conf group=sys reboot-needed=false +file path=kernel/drv/crypto.conf group=sys $(i386_ONLY)file path=kernel/drv/cryptoadm group=sys -file path=kernel/drv/cryptoadm.conf group=sys reboot-needed=false -$(sparc_ONLY)file path=kernel/drv/dad.conf group=sys reboot-needed=false +file path=kernel/drv/cryptoadm.conf group=sys +$(sparc_ONLY)file path=kernel/drv/dad.conf group=sys $(i386_ONLY)file path=kernel/drv/devinfo group=sys -file path=kernel/drv/devinfo.conf group=sys reboot-needed=false +file path=kernel/drv/devinfo.conf group=sys $(i386_ONLY)file path=kernel/drv/dld group=sys -file path=kernel/drv/dld.conf group=sys reboot-needed=false +file path=kernel/drv/dld.conf group=sys $(i386_ONLY)file path=kernel/drv/dlpistub group=sys -file path=kernel/drv/dlpistub.conf group=sys reboot-needed=false +file path=kernel/drv/dlpistub.conf group=sys $(i386_ONLY)file path=kernel/drv/i8042 group=sys $(i386_ONLY)file path=kernel/drv/icmp group=sys -file path=kernel/drv/icmp.conf group=sys reboot-needed=false +file path=kernel/drv/icmp.conf group=sys $(i386_ONLY)file path=kernel/drv/icmp6 group=sys -file path=kernel/drv/icmp6.conf group=sys reboot-needed=false +file path=kernel/drv/icmp6.conf group=sys $(i386_ONLY)file path=kernel/drv/intel_nb5000 group=sys -$(i386_ONLY)file path=kernel/drv/intel_nb5000.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/intel_nb5000.conf group=sys $(i386_ONLY)file path=kernel/drv/intel_nhm group=sys -$(i386_ONLY)file path=kernel/drv/intel_nhm.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/intel_nhm.conf group=sys $(i386_ONLY)file path=kernel/drv/intel_nhmex group=sys -$(i386_ONLY)file path=kernel/drv/intel_nhmex.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/intel_nhmex.conf group=sys $(i386_ONLY)file path=kernel/drv/ip group=sys -file path=kernel/drv/ip.conf group=sys reboot-needed=false +file path=kernel/drv/ip.conf group=sys $(i386_ONLY)file path=kernel/drv/ip6 group=sys -file path=kernel/drv/ip6.conf group=sys reboot-needed=false +file path=kernel/drv/ip6.conf group=sys $(i386_ONLY)file path=kernel/drv/ipnet group=sys -file path=kernel/drv/ipnet.conf group=sys reboot-needed=false +file path=kernel/drv/ipnet.conf group=sys $(i386_ONLY)file path=kernel/drv/ippctl group=sys -file path=kernel/drv/ippctl.conf group=sys reboot-needed=false +file path=kernel/drv/ippctl.conf group=sys $(i386_ONLY)file path=kernel/drv/ipsecah group=sys -file path=kernel/drv/ipsecah.conf group=sys reboot-needed=false +file path=kernel/drv/ipsecah.conf group=sys $(i386_ONLY)file path=kernel/drv/ipsecesp group=sys -file path=kernel/drv/ipsecesp.conf group=sys reboot-needed=false +file path=kernel/drv/ipsecesp.conf group=sys $(i386_ONLY)file path=kernel/drv/iptun group=sys -file path=kernel/drv/iptun.conf group=sys reboot-needed=false +file path=kernel/drv/iptun.conf group=sys $(i386_ONLY)file path=kernel/drv/iwscn group=sys -file path=kernel/drv/iwscn.conf group=sys reboot-needed=false +file path=kernel/drv/iwscn.conf group=sys $(i386_ONLY)file path=kernel/drv/kb8042 group=sys $(i386_ONLY)file path=kernel/drv/keysock group=sys -file path=kernel/drv/keysock.conf group=sys reboot-needed=false +file path=kernel/drv/keysock.conf group=sys $(i386_ONLY)file path=kernel/drv/kmdb group=sys -file path=kernel/drv/kmdb.conf group=sys reboot-needed=false +file path=kernel/drv/kmdb.conf group=sys $(i386_ONLY)file path=kernel/drv/kssl group=sys -file path=kernel/drv/kssl.conf group=sys reboot-needed=false +file path=kernel/drv/kssl.conf group=sys $(i386_ONLY)file path=kernel/drv/llc1 group=sys -file path=kernel/drv/llc1.conf group=sys reboot-needed=false +file path=kernel/drv/llc1.conf group=sys $(i386_ONLY)file path=kernel/drv/lofi group=sys -file path=kernel/drv/lofi.conf group=sys reboot-needed=false +file path=kernel/drv/lofi.conf group=sys $(i386_ONLY)file path=kernel/drv/log group=sys file path=kernel/drv/log.conf group=sys \ - original_name=SUNWckr:kernel/drv/log.conf preserve=true reboot-needed=false + original_name=SUNWckr:kernel/drv/log.conf preserve=true $(i386_ONLY)file path=kernel/drv/mc-amd group=sys -$(i386_ONLY)file path=kernel/drv/mc-amd.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/mc-amd.conf group=sys $(i386_ONLY)file path=kernel/drv/mm group=sys -file path=kernel/drv/mm.conf group=sys reboot-needed=false +file path=kernel/drv/mm.conf group=sys $(i386_ONLY)file path=kernel/drv/mouse8042 group=sys $(i386_ONLY)file path=kernel/drv/mpt group=sys $(i386_ONLY)file path=kernel/drv/mpt.conf group=sys \ - original_name=SUNWckr:kernel/drv/mpt.conf preserve=true reboot-needed=false + original_name=SUNWckr:kernel/drv/mpt.conf preserve=true $(i386_ONLY)file path=kernel/drv/nulldriver group=sys $(i386_ONLY)file path=kernel/drv/openeepr group=sys -file path=kernel/drv/openeepr.conf group=sys reboot-needed=false +file path=kernel/drv/openeepr.conf group=sys $(i386_ONLY)file path=kernel/drv/options group=sys -file path=kernel/drv/options.conf group=sys reboot-needed=false +file path=kernel/drv/options.conf group=sys $(i386_ONLY)file path=kernel/drv/pci_pci group=sys $(i386_ONLY)file path=kernel/drv/pcieb group=sys -file path=kernel/drv/pcieb.conf group=sys reboot-needed=false +file path=kernel/drv/pcieb.conf group=sys $(i386_ONLY)file path=kernel/drv/physmem group=sys -file path=kernel/drv/physmem.conf group=sys reboot-needed=false +file path=kernel/drv/physmem.conf group=sys $(i386_ONLY)file path=kernel/drv/poll group=sys -file path=kernel/drv/poll.conf group=sys reboot-needed=false +file path=kernel/drv/poll.conf group=sys $(i386_ONLY)file path=kernel/drv/power group=sys -$(i386_ONLY)file path=kernel/drv/power.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/power.conf group=sys $(i386_ONLY)file path=kernel/drv/pseudo group=sys -file path=kernel/drv/pseudo.conf group=sys reboot-needed=false +file path=kernel/drv/pseudo.conf group=sys $(i386_ONLY)file path=kernel/drv/ptc group=sys -file path=kernel/drv/ptc.conf group=sys reboot-needed=false +file path=kernel/drv/ptc.conf group=sys $(i386_ONLY)file path=kernel/drv/ptsl group=sys -file path=kernel/drv/ptsl.conf group=sys reboot-needed=false +file path=kernel/drv/ptsl.conf group=sys $(i386_ONLY)file path=kernel/drv/ramdisk group=sys -file path=kernel/drv/ramdisk.conf group=sys reboot-needed=false +file path=kernel/drv/ramdisk.conf group=sys $(i386_ONLY)file path=kernel/drv/random group=sys -file path=kernel/drv/random.conf group=sys reboot-needed=false +file path=kernel/drv/random.conf group=sys $(i386_ONLY)file path=kernel/drv/rts group=sys -file path=kernel/drv/rts.conf group=sys reboot-needed=false +file path=kernel/drv/rts.conf group=sys $(i386_ONLY)file path=kernel/drv/sad group=sys -file path=kernel/drv/sad.conf group=sys reboot-needed=false +file path=kernel/drv/sad.conf group=sys $(i386_ONLY)file path=kernel/drv/scsi_vhci group=sys file path=kernel/drv/scsi_vhci.conf group=sys \ - original_name=SUNWckr:kernel/drv/scsi_vhci.conf preserve=true \ - reboot-needed=false + original_name=SUNWckr:kernel/drv/scsi_vhci.conf preserve=true $(sparc_ONLY)file path=kernel/drv/sd.conf group=sys \ - original_name=SUNWckr:kernel/drv/sd.conf preserve=true reboot-needed=false + original_name=SUNWckr:kernel/drv/sd.conf preserve=true $(i386_ONLY)file path=kernel/drv/sgen group=sys file path=kernel/drv/sgen.conf group=sys \ - original_name=SUNWckr:kernel/drv/sgen.conf preserve=true \ - reboot-needed=false + original_name=SUNWckr:kernel/drv/sgen.conf preserve=true $(i386_ONLY)file path=kernel/drv/simnet group=sys -file path=kernel/drv/simnet.conf group=sys reboot-needed=false +file path=kernel/drv/simnet.conf group=sys $(i386_ONLY)file path=kernel/drv/smbios group=sys -$(i386_ONLY)file path=kernel/drv/smbios.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/smbios.conf group=sys $(i386_ONLY)file path=kernel/drv/softmac group=sys -file path=kernel/drv/softmac.conf group=sys reboot-needed=false +file path=kernel/drv/softmac.conf group=sys $(i386_ONLY)file path=kernel/drv/spdsock group=sys -file path=kernel/drv/spdsock.conf group=sys reboot-needed=false +file path=kernel/drv/spdsock.conf group=sys $(i386_ONLY)file path=kernel/drv/st group=sys -file path=kernel/drv/st.conf group=sys original_name=SUNWckr:kernel/drv/st.conf \ - preserve=true reboot-needed=false +file path=kernel/drv/st.conf group=sys \ + original_name=SUNWckr:kernel/drv/st.conf preserve=true $(i386_ONLY)file path=kernel/drv/sy group=sys -file path=kernel/drv/sy.conf group=sys reboot-needed=false +file path=kernel/drv/sy.conf group=sys $(i386_ONLY)file path=kernel/drv/sysevent group=sys -file path=kernel/drv/sysevent.conf group=sys reboot-needed=false +file path=kernel/drv/sysevent.conf group=sys $(i386_ONLY)file path=kernel/drv/sysmsg group=sys -file path=kernel/drv/sysmsg.conf group=sys reboot-needed=false +file path=kernel/drv/sysmsg.conf group=sys $(i386_ONLY)file path=kernel/drv/tcp group=sys -file path=kernel/drv/tcp.conf group=sys reboot-needed=false +file path=kernel/drv/tcp.conf group=sys $(i386_ONLY)file path=kernel/drv/tcp6 group=sys -file path=kernel/drv/tcp6.conf group=sys reboot-needed=false +file path=kernel/drv/tcp6.conf group=sys $(i386_ONLY)file path=kernel/drv/tl group=sys -file path=kernel/drv/tl.conf group=sys reboot-needed=false +file path=kernel/drv/tl.conf group=sys $(i386_ONLY)file path=kernel/drv/tzmon group=sys -$(i386_ONLY)file path=kernel/drv/tzmon.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/tzmon.conf group=sys $(sparc_ONLY)file path=kernel/drv/uata.conf group=sys \ - original_name=SUNWckr:kernel/drv/uata.conf preserve=true \ - reboot-needed=false + original_name=SUNWckr:kernel/drv/uata.conf preserve=true $(i386_ONLY)file path=kernel/drv/ucode group=sys -$(i386_ONLY)file path=kernel/drv/ucode.conf group=sys reboot-needed=false +$(i386_ONLY)file path=kernel/drv/ucode.conf group=sys $(i386_ONLY)file path=kernel/drv/udp group=sys -file path=kernel/drv/udp.conf group=sys reboot-needed=false +file path=kernel/drv/udp.conf group=sys $(i386_ONLY)file path=kernel/drv/udp6 group=sys -file path=kernel/drv/udp6.conf group=sys reboot-needed=false +file path=kernel/drv/udp6.conf group=sys $(i386_ONLY)file path=kernel/drv/vgatext group=sys $(i386_ONLY)file path=kernel/drv/vnic group=sys -file path=kernel/drv/vnic.conf group=sys reboot-needed=false +file path=kernel/drv/vnic.conf group=sys $(i386_ONLY)file path=kernel/drv/wc group=sys -file path=kernel/drv/wc.conf group=sys reboot-needed=false -$(sparc_ONLY)file path=kernel/exec/$(ARCH64)/aoutexec group=sys mode=0755 \ - reboot-needed=true -file path=kernel/exec/$(ARCH64)/elfexec group=sys mode=0755 reboot-needed=true -file path=kernel/exec/$(ARCH64)/intpexec group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/exec/elfexec group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/exec/intpexec group=sys mode=0755 \ - reboot-needed=true -file path=kernel/fs/$(ARCH64)/autofs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/cachefs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/ctfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/dcfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/dev group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/devfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/fifofs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/hsfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/lofs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/mntfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/namefs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/objfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/procfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/sharefs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/sockfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/specfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/tmpfs group=sys mode=0755 reboot-needed=true -file path=kernel/fs/$(ARCH64)/ufs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/autofs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/cachefs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/ctfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/dcfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/dev group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/devfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/fifofs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/hsfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/lofs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/mntfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/namefs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/objfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/procfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/sharefs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/sockfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/specfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/tmpfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/fs/ufs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/genunix group=sys mode=0755 reboot-needed=true -file path=kernel/ipp/$(ARCH64)/ipgpc group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/ipp/ipgpc group=sys mode=0755 reboot-needed=true -file path=kernel/kiconv/$(ARCH64)/kiconv_emea group=sys mode=0755 \ - reboot-needed=true -file path=kernel/kiconv/$(ARCH64)/kiconv_ja group=sys mode=0755 \ - reboot-needed=true -file path=kernel/kiconv/$(ARCH64)/kiconv_ko group=sys mode=0755 \ - reboot-needed=true -file path=kernel/kiconv/$(ARCH64)/kiconv_sc group=sys mode=0755 \ - reboot-needed=true -file path=kernel/kiconv/$(ARCH64)/kiconv_tc group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/kiconv/kiconv_emea group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/kiconv/kiconv_ja group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/kiconv/kiconv_ko group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/kiconv/kiconv_sc group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/kiconv/kiconv_tc group=sys mode=0755 \ - reboot-needed=true -file path=kernel/mac/$(ARCH64)/mac_6to4 group=sys mode=0755 reboot-needed=true -file path=kernel/mac/$(ARCH64)/mac_ether group=sys mode=0755 reboot-needed=true -file path=kernel/mac/$(ARCH64)/mac_ib group=sys mode=0755 reboot-needed=true -file path=kernel/mac/$(ARCH64)/mac_ipv4 group=sys mode=0755 reboot-needed=true -file path=kernel/mac/$(ARCH64)/mac_ipv6 group=sys mode=0755 reboot-needed=true -file path=kernel/mac/$(ARCH64)/mac_wifi group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/mac/mac_6to4 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/mac/mac_ether group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/mac/mac_ib group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/mac/mac_ipv4 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/mac/mac_ipv6 group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/mac/mac_wifi group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/acpica group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/agpmaster group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/bignum group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/bootdev group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/busra group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/cardbus group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/cmlb group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/consconfig group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/ctf group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/dada group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/dls group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/fssnap_if group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/gld group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/hook group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/hpcsvc group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/idmap group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/iommulib group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/ipc group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/kbtrans group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/kcf group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/kmdbmod group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/ksocket group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/mac group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/mii group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/net80211 group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/neti group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/pci_autoconfig group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/pcicfg group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/pcie group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/pcihp group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/pcmcia group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/rpcsec group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/sata group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/scsi group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/strplumb group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/swapgeneric group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/$(ARCH64)/tem group=sys mode=0755 reboot-needed=true -file path=kernel/misc/$(ARCH64)/tlimod group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/acpica group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/agpmaster group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/bignum group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/bootdev group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/busra group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/cardbus group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/cmlb group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/consconfig group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ctf group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/dls group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/fssnap_if group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/gld group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/hook group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/hpcsvc group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/idmap group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/iommulib group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ipc group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/kbtrans group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/kcf group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/kmdbmod group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/ksocket group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/mac group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/mii group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/net80211 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/neti group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/pci_autoconfig group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/pcicfg group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/pcie group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/pcihp group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/pcmcia group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/rpcsec group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/sata group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/scsi group=sys mode=0755 reboot-needed=true +file path=kernel/drv/wc.conf group=sys +$(sparc_ONLY)file path=kernel/exec/$(ARCH64)/aoutexec group=sys mode=0755 +file path=kernel/exec/$(ARCH64)/elfexec group=sys mode=0755 +file path=kernel/exec/$(ARCH64)/intpexec group=sys mode=0755 +$(i386_ONLY)file path=kernel/exec/elfexec group=sys mode=0755 +$(i386_ONLY)file path=kernel/exec/intpexec group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/autofs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/cachefs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/ctfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/dcfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/dev group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/devfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/fifofs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/hsfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/lofs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/mntfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/namefs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/objfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/procfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/sharefs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/sockfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/specfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/tmpfs group=sys mode=0755 +file path=kernel/fs/$(ARCH64)/ufs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/autofs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/cachefs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/ctfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/dcfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/dev group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/devfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/fifofs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/hsfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/lofs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/mntfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/namefs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/objfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/procfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/sharefs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/sockfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/specfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/tmpfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/fs/ufs group=sys mode=0755 +$(i386_ONLY)file path=kernel/genunix group=sys mode=0755 +file path=kernel/ipp/$(ARCH64)/ipgpc group=sys mode=0755 +$(i386_ONLY)file path=kernel/ipp/ipgpc group=sys mode=0755 +file path=kernel/kiconv/$(ARCH64)/kiconv_emea group=sys mode=0755 +file path=kernel/kiconv/$(ARCH64)/kiconv_ja group=sys mode=0755 +file path=kernel/kiconv/$(ARCH64)/kiconv_ko group=sys mode=0755 +file path=kernel/kiconv/$(ARCH64)/kiconv_sc group=sys mode=0755 +file path=kernel/kiconv/$(ARCH64)/kiconv_tc group=sys mode=0755 +$(i386_ONLY)file path=kernel/kiconv/kiconv_emea group=sys mode=0755 +$(i386_ONLY)file path=kernel/kiconv/kiconv_ja group=sys mode=0755 +$(i386_ONLY)file path=kernel/kiconv/kiconv_ko group=sys mode=0755 +$(i386_ONLY)file path=kernel/kiconv/kiconv_sc group=sys mode=0755 +$(i386_ONLY)file path=kernel/kiconv/kiconv_tc group=sys mode=0755 +file path=kernel/mac/$(ARCH64)/mac_6to4 group=sys mode=0755 +file path=kernel/mac/$(ARCH64)/mac_ether group=sys mode=0755 +file path=kernel/mac/$(ARCH64)/mac_ib group=sys mode=0755 +file path=kernel/mac/$(ARCH64)/mac_ipv4 group=sys mode=0755 +file path=kernel/mac/$(ARCH64)/mac_ipv6 group=sys mode=0755 +file path=kernel/mac/$(ARCH64)/mac_wifi group=sys mode=0755 +$(i386_ONLY)file path=kernel/mac/mac_6to4 group=sys mode=0755 +$(i386_ONLY)file path=kernel/mac/mac_ether group=sys mode=0755 +$(i386_ONLY)file path=kernel/mac/mac_ib group=sys mode=0755 +$(i386_ONLY)file path=kernel/mac/mac_ipv4 group=sys mode=0755 +$(i386_ONLY)file path=kernel/mac/mac_ipv6 group=sys mode=0755 +$(i386_ONLY)file path=kernel/mac/mac_wifi group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/acpica group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/agpmaster group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/bignum group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/bootdev group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/busra group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/cardbus group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/cmlb group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/consconfig group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/ctf group=sys mode=0755 +$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/dada group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/dls group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/fssnap_if group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/gld group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/hook group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/hpcsvc group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/idmap group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/iommulib group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/ipc group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/kbtrans group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/kcf group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/kmdbmod group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/ksocket group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/mac group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/mii group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/net80211 group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/neti group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/pci_autoconfig group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/pcicfg group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/pcie group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/pcihp group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/pcmcia group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/rpcsec group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/$(ARCH64)/sata group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/scsi group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/strplumb group=sys mode=0755 +$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/swapgeneric group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/tem group=sys mode=0755 +file path=kernel/misc/$(ARCH64)/tlimod group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/acpica group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/agpmaster group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/bignum group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/bootdev group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/busra group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/cardbus group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/cmlb group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/consconfig group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ctf group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/dls group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/fssnap_if group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/gld group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/hook group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/hpcsvc group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/idmap group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/iommulib group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ipc group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/kbtrans group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/kcf group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/kmdbmod group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/ksocket group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/mac group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/mii group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/net80211 group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/neti group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/pci_autoconfig group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/pcicfg group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/pcie group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/pcihp group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/pcmcia group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/rpcsec group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/sata group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/scsi group=sys mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_emc group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_lsi group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_sun group=sys \ - mode=0755 reboot-needed=true -file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym group=sys mode=0755 \ - reboot-needed=true + mode=0755 +file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym group=sys mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym_emc group=sys \ - mode=0755 reboot-needed=true + mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym_hds group=sys \ - mode=0755 reboot-needed=true -file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tape group=sys mode=0755 \ - reboot-needed=true -file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs group=sys mode=0755 \ - reboot-needed=true + mode=0755 +file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tape group=sys mode=0755 +file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs group=sys mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs_tape group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_emc group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_lsi group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_sun group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym group=sys \ + mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym_emc group=sys \ - mode=0755 reboot-needed=true + mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym_hds group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tape group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tpgs group=sys mode=0755 \ - reboot-needed=true + mode=0755 +$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tape group=sys \ + mode=0755 +$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tpgs group=sys \ + mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tpgs_tape group=sys \ - mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/strplumb group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/misc/tem group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/misc/tlimod group=sys mode=0755 reboot-needed=true -file path=kernel/sched/$(ARCH64)/SDC group=sys mode=0755 reboot-needed=true -file path=kernel/sched/$(ARCH64)/TS group=sys mode=0755 reboot-needed=true -file path=kernel/sched/$(ARCH64)/TS_DPTBL group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sched/SDC group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sched/TS group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sched/TS_DPTBL group=sys mode=0755 \ - reboot-needed=true -file path=kernel/socketmod/$(ARCH64)/socksctp group=sys mode=0755 \ - reboot-needed=true -file path=kernel/socketmod/$(ARCH64)/trill group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/socketmod/socksctp group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/socketmod/trill group=sys mode=0755 \ - reboot-needed=true -file path=kernel/strmod/$(ARCH64)/bufmod group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/connld group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/dedump group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/drcompat group=sys mode=0755 \ - reboot-needed=true -file path=kernel/strmod/$(ARCH64)/ldterm group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/ms group=sys mode=0755 \ - reboot-needed=true -file path=kernel/strmod/$(ARCH64)/pckt group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/pfmod group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/pipemod group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/ptem group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/redirmod group=sys mode=0755 \ - reboot-needed=true -file path=kernel/strmod/$(ARCH64)/rpcmod group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/timod group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/tirdwr group=sys mode=0755 reboot-needed=true -file path=kernel/strmod/$(ARCH64)/ttcompat group=sys mode=0755 \ - reboot-needed=true -$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/bufmod group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/connld group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/dedump group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/drcompat group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/ldterm group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/pckt group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/pfmod group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/pipemod group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/ptem group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/redirmod group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/rpcmod group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/timod group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/tirdwr group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/strmod/ttcompat group=sys mode=0755 \ - reboot-needed=true -file path=kernel/sys/$(ARCH64)/c2audit group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/doorfs group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/inst_sync group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/kaio group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/msgsys group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/pipe group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/portfs group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/pset group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/semsys group=sys mode=0755 reboot-needed=true -file path=kernel/sys/$(ARCH64)/shmsys group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/c2audit group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/doorfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/inst_sync group=sys mode=0755 \ - reboot-needed=true -$(i386_ONLY)file path=kernel/sys/kaio group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/msgsys group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/pipe group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/portfs group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/pset group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/semsys group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/sys/shmsys group=sys mode=0755 reboot-needed=true -file path=lib/svc/method/svc-dumpadm mode=0555 -file path=lib/svc/method/svc-intrd mode=0555 -file path=lib/svc/method/svc-scheduler mode=0555 + mode=0755 +$(i386_ONLY)file path=kernel/misc/strplumb group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/tem group=sys mode=0755 +$(i386_ONLY)file path=kernel/misc/tlimod group=sys mode=0755 +file path=kernel/sched/$(ARCH64)/SDC group=sys mode=0755 +file path=kernel/sched/$(ARCH64)/TS group=sys mode=0755 +file path=kernel/sched/$(ARCH64)/TS_DPTBL group=sys mode=0755 +$(i386_ONLY)file path=kernel/sched/SDC group=sys mode=0755 +$(i386_ONLY)file path=kernel/sched/TS group=sys mode=0755 +$(i386_ONLY)file path=kernel/sched/TS_DPTBL group=sys mode=0755 +file path=kernel/socketmod/$(ARCH64)/socksctp group=sys mode=0755 +file path=kernel/socketmod/$(ARCH64)/trill group=sys mode=0755 +$(i386_ONLY)file path=kernel/socketmod/socksctp group=sys mode=0755 +$(i386_ONLY)file path=kernel/socketmod/trill group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/bufmod group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/connld group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/dedump group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/drcompat group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/ldterm group=sys mode=0755 +$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/ms group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/pckt group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/pfmod group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/pipemod group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/ptem group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/redirmod group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/rpcmod group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/timod group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/tirdwr group=sys mode=0755 +file path=kernel/strmod/$(ARCH64)/ttcompat group=sys mode=0755 +$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/bufmod group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/connld group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/dedump group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/drcompat group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/ldterm group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/pckt group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/pfmod group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/pipemod group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/ptem group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/redirmod group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/rpcmod group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/timod group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/tirdwr group=sys mode=0755 +$(i386_ONLY)file path=kernel/strmod/ttcompat group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/c2audit group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/doorfs group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/inst_sync group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/kaio group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/msgsys group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/pipe group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/portfs group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/pset group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/semsys group=sys mode=0755 +file path=kernel/sys/$(ARCH64)/shmsys group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/c2audit group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/doorfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/inst_sync group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/kaio group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/msgsys group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/pipe group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/portfs group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/pset group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/semsys group=sys mode=0755 +$(i386_ONLY)file path=kernel/sys/shmsys group=sys mode=0755 file path=lib/svc/manifest/system/dumpadm.xml group=sys mode=0444 file path=lib/svc/manifest/system/fmd.xml group=sys mode=0444 file path=lib/svc/manifest/system/intrd.xml group=sys mode=0444 file path=lib/svc/manifest/system/scheduler.xml group=sys mode=0444 +file path=lib/svc/method/svc-dumpadm mode=0555 +file path=lib/svc/method/svc-intrd mode=0555 +file path=lib/svc/method/svc-scheduler mode=0555 hardlink path=kernel/misc/$(ARCH64)/md5 \ target=../../../kernel/crypto/$(ARCH64)/md5 hardlink path=kernel/misc/$(ARCH64)/sha1 \ @@ -869,7 +802,8 @@ hardlink path=kernel/strmod/$(ARCH64)/arp \ target=../../../kernel/drv/$(ARCH64)/arp hardlink path=kernel/strmod/$(ARCH64)/icmp \ target=../../../kernel/drv/$(ARCH64)/icmp -hardlink path=kernel/strmod/$(ARCH64)/ip target=../../../kernel/drv/$(ARCH64)/ip +hardlink path=kernel/strmod/$(ARCH64)/ip \ + target=../../../kernel/drv/$(ARCH64)/ip hardlink path=kernel/strmod/$(ARCH64)/ipsecah \ target=../../../kernel/drv/$(ARCH64)/ipsecah hardlink path=kernel/strmod/$(ARCH64)/ipsecesp \ @@ -883,10 +817,12 @@ hardlink path=kernel/strmod/$(ARCH64)/udp \ $(i386_ONLY)hardlink path=kernel/strmod/arp target=../../kernel/drv/arp $(i386_ONLY)hardlink path=kernel/strmod/icmp target=../../kernel/drv/icmp $(i386_ONLY)hardlink path=kernel/strmod/ip target=../../kernel/drv/ip -$(i386_ONLY)hardlink path=kernel/strmod/ipsecah target=../../kernel/drv/ipsecah +$(i386_ONLY)hardlink path=kernel/strmod/ipsecah \ + target=../../kernel/drv/ipsecah $(i386_ONLY)hardlink path=kernel/strmod/ipsecesp \ target=../../kernel/drv/ipsecesp -$(i386_ONLY)hardlink path=kernel/strmod/keysock target=../../kernel/drv/keysock +$(i386_ONLY)hardlink path=kernel/strmod/keysock \ + target=../../kernel/drv/keysock $(i386_ONLY)hardlink path=kernel/strmod/tcp target=../../kernel/drv/tcp $(i386_ONLY)hardlink path=kernel/strmod/udp target=../../kernel/drv/udp hardlink path=kernel/sys/$(ARCH64)/autofs \ @@ -928,6 +864,7 @@ license uts/intel/io/acpica/THIRDPARTYLICENSE \ $(i386_ONLY)link path=boot/solaris/bin/root_archive \ target=../../../usr/sbin/root_archive link path=dev/dld target=../devices/pseudo/dld@0:ctl -link path=kernel/misc/$(ARCH64)/des target=../../../kernel/crypto/$(ARCH64)/des +link path=kernel/misc/$(ARCH64)/des \ + target=../../../kernel/crypto/$(ARCH64)/des $(i386_ONLY)link path=kernel/misc/des target=../../kernel/crypto/des $(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require diff --git a/usr/src/pkg/manifests/system-ldoms.mf b/usr/src/pkg/manifests/system-ldoms.mf index f600554dcd..162cb1d11e 100644 --- a/usr/src/pkg/manifests/system-ldoms.mf +++ b/usr/src/pkg/manifests/system-ldoms.mf @@ -20,25 +20,26 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/ldoms@$(PKGVERS) set name=pkg.description value="Solaris Logical Domains Configuration Files" set name=pkg.summary value="Solaris Logical Domains" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/platform group=sys +dir path=lib/svc/manifest/platform/sun4v group=sys dir path=lib/svc/method dir path=platform group=sys dir path=platform/sun4v group=sys @@ -53,9 +54,6 @@ dir path=usr/lib/$(ARCH64) dir path=usr/lib/ldoms dir path=usr/lib/rcm dir path=usr/lib/rcm/scripts -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/platform group=sys -dir path=lib/svc/manifest/platform/sun4v group=sys driver name=cnex alias=SUNW,sun4v-channel-devices driver name=drctl driver name=ds_pri @@ -67,8 +65,11 @@ driver name=vldc alias=SUNW,sun4v-channel driver name=vlds alias=SUNW,sun4v-domain-service driver name=vnet alias=SUNW,sun4v-network clone_perms="vnet 0666 root sys" \ perms="* 0666 root sys" -driver name=vsw alias=SUNW,sun4v-network-switch clone_perms="vsw 0666 root sys" \ - perms="* 0666 root sys" +driver name=vsw alias=SUNW,sun4v-network-switch \ + clone_perms="vsw 0666 root sys" perms="* 0666 root sys" +file path=lib/svc/manifest/platform/sun4v/drd.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4v/ldoms-agents.xml group=sys mode=0444 +file path=lib/svc/manifest/platform/sun4v/vntsd.xml group=sys mode=0444 file path=lib/svc/method/ldoms-agents mode=0555 file path=lib/svc/method/svc-drd mode=0555 file path=lib/svc/method/svc-vntsd mode=0555 @@ -83,23 +84,16 @@ file path=platform/sun4v/kernel/drv/$(ARCH64)/vldc group=sys file path=platform/sun4v/kernel/drv/$(ARCH64)/vlds group=sys file path=platform/sun4v/kernel/drv/$(ARCH64)/vnet group=sys file path=platform/sun4v/kernel/drv/$(ARCH64)/vsw group=sys -file path=platform/sun4v/kernel/drv/drctl.conf group=sys reboot-needed=false -file path=platform/sun4v/kernel/drv/ds_pri.conf group=sys reboot-needed=false -file path=platform/sun4v/kernel/drv/ds_snmp.conf group=sys reboot-needed=false -file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_cpu group=sys mode=0755 \ - reboot-needed=true -file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_io group=sys mode=0755 \ - reboot-needed=true -file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_mem group=sys mode=0755 \ - reboot-needed=true -file path=platform/sun4v/kernel/misc/$(ARCH64)/ds group=sys mode=0755 \ - reboot-needed=true -file path=platform/sun4v/kernel/misc/$(ARCH64)/fault_iso group=sys mode=0755 \ - reboot-needed=true -file path=platform/sun4v/kernel/misc/$(ARCH64)/ldc group=sys mode=0755 \ - reboot-needed=true -file path=platform/sun4v/kernel/misc/$(ARCH64)/platsvc group=sys mode=0755 \ - reboot-needed=true +file path=platform/sun4v/kernel/drv/drctl.conf group=sys +file path=platform/sun4v/kernel/drv/ds_pri.conf group=sys +file path=platform/sun4v/kernel/drv/ds_snmp.conf group=sys +file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_cpu group=sys mode=0755 +file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_io group=sys mode=0755 +file path=platform/sun4v/kernel/misc/$(ARCH64)/dr_mem group=sys mode=0755 +file path=platform/sun4v/kernel/misc/$(ARCH64)/ds group=sys mode=0755 +file path=platform/sun4v/kernel/misc/$(ARCH64)/fault_iso group=sys mode=0755 +file path=platform/sun4v/kernel/misc/$(ARCH64)/ldc group=sys mode=0755 +file path=platform/sun4v/kernel/misc/$(ARCH64)/platsvc group=sys mode=0755 file path=usr/lib/$(ARCH64)/libds.so.1 file path=usr/lib/$(ARCH64)/libpri.so.1 file path=usr/lib/ldoms/drd mode=0555 @@ -108,9 +102,6 @@ file path=usr/lib/ldoms/vntsd mode=0555 file path=usr/lib/libds.so.1 file path=usr/lib/libpri.so.1 file path=usr/lib/rcm/scripts/SUNW,vdevices.pl mode=0555 -file path=lib/svc/manifest/platform/sun4v/drd.xml group=sys mode=0444 -file path=lib/svc/manifest/platform/sun4v/ldoms-agents.xml group=sys mode=0444 -file path=lib/svc/manifest/platform/sun4v/vntsd.xml group=sys mode=0444 legacy pkg=SUNWldomr.v arch=$(ARCH).sun4v category=system \ desc="Solaris Logical Domains Configuration Files" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-library-install-libinstzones.mf b/usr/src/pkg/manifests/system-library-install-libinstzones.mf index 8845b7d52c..889752cabd 100644 --- a/usr/src/pkg/manifests/system-library-install-libinstzones.mf +++ b/usr/src/pkg/manifests/system-library-install-libinstzones.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/install/libinstzones@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Solaris Install Internal Files" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf b/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf index 6709309deb..7f57d50412 100644 --- a/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf +++ b/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -31,7 +30,6 @@ set name=pkg.summary value="libdiskmgt private header file pkg" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include file path=usr/include/libdiskmgt.h diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt.mf b/usr/src/pkg/manifests/system-library-libdiskmgt.mf index 49436ef661..2c1763fa1f 100644 --- a/usr/src/pkg/manifests/system-library-libdiskmgt.mf +++ b/usr/src/pkg/manifests/system-library-libdiskmgt.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/libdiskmgt@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Storage Management APIs" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-libfcoe.mf b/usr/src/pkg/manifests/system-library-libfcoe.mf index 0c0e63e1c9..a16f4cb85d 100644 --- a/usr/src/pkg/manifests/system-library-libfcoe.mf +++ b/usr/src/pkg/manifests/system-library-libfcoe.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/libfcoe@$(PKGVERS) set name=pkg.description \ value="Sun FCoE (Fibre Channel over Ethernet) Port Management Library" set name=pkg.summary value="Sun FCoE Port Management Library" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Storage +set name=info.classification \ + value=org.opensolaris.category.2008:Drivers/Storage set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-library-platform.mf b/usr/src/pkg/manifests/system-library-platform.mf index 34c7134e5d..4fce3c0acf 100644 --- a/usr/src/pkg/manifests/system-library-platform.mf +++ b/usr/src/pkg/manifests/system-library-platform.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/platform@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Core Architecture, (Kvm)" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/platform group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys @@ -161,10 +159,12 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Ultra-Enterprise/lib/$(ARCH64) $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib -$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/$(ARCH64) +$(sparc_ONLY)dir \ + path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/$(ARCH64) $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib -$(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/$(ARCH64) +$(sparc_ONLY)dir \ + path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/$(ARCH64) $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib $(sparc_ONLY)dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib/$(ARCH64) @@ -203,7 +203,8 @@ $(sparc_ONLY)file \ $(sparc_ONLY)file path=usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm/scsi.so.1 $(sparc_ONLY)file \ path=usr/platform/SUNW,SPARC-Enterprise/lib/libprtdiag_psr.so.1 -$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-15000/lib/libprtdiag_psr.so.1 +$(sparc_ONLY)file \ + path=usr/platform/SUNW,Sun-Fire-15000/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-280R/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/libprtdiag_psr.so.1 $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-880/lib/libprtdiag_psr.so.1 @@ -285,7 +286,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/cfgadm \ target=../../sun4u/lib/cfgadm $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/fs \ target=../../sun4u/lib/fs -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-CP2300/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/sbin/prtdiag \ target=../../sun4u/sbin/prtdiag @@ -298,7 +300,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/cfgadm \ target=../../sun4u/lib/cfgadm $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/fs \ target=../../sun4u/lib/fs -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-CP3010/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3010/sbin/prtdiag \ target=../../sun4u/sbin/prtdiag @@ -313,7 +316,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-CP3060/lib/libsoftcrypto_psr.so.1 \ target=../../sun4v/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3060/sbin/prtdiag \ target=../../sun4v/sbin/prtdiag @@ -328,7 +332,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-CP3260/lib/libsoftcrypto_psr.so.1 \ target=../../sun4v/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP3260/sbin/prtdiag \ target=../../sun4v/sbin/prtdiag @@ -366,7 +371,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-T5220/lib/libsoftcrypto_psr.so.1 \ target=../../sun4v/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5220/lib/libtsalarm.so \ target=../../sun4v/lib/libtsalarm.so @@ -384,7 +390,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Netra-T5440/lib/libsoftcrypto_psr.so.1 \ target=../../sun4v/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,Netra-T5440/lib/libtsalarm.so \ target=../../sun4v/lib/libtsalarm.so @@ -402,7 +409,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fs \ target=../../sun4v/lib/fs $(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so -$(sparc_ONLY)link path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libsoftcrypto_psr.so.1 \ @@ -429,9 +437,11 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Serverblade1/lib/cfgadm \ target=../../sun4u/lib/cfgadm $(sparc_ONLY)link path=usr/platform/SUNW,Serverblade1/lib/fs \ target=../../sun4u/lib/fs -$(sparc_ONLY)link path=usr/platform/SUNW,Serverblade1/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Serverblade1/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Serverblade1/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Serverblade1/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-100/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -442,7 +452,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/lib/fs \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-100/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-100/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-1000/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -488,7 +499,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Blade-T6300/lib/libprtdiag_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Blade-T6300/lib/libprtdiag_psr.so.1 \ target=../../SUNW,Sun-Fire-T200/lib/libprtdiag_psr.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Blade-T6300/lib/libsoftcrypto_psr.so.1 \ @@ -532,7 +544,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/lib/fs \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-280R/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-280R/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-480R/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -543,7 +556,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/lib/fs \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-480R/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-480R/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-880/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -551,9 +565,11 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/lib/cfgadm \ target=../../sun4u/lib/cfgadm $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/lib/fs \ target=../../sun4u/lib/fs -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,Sun-Fire-880/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-880/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T1000 \ target=SUNW,Sun-Fire-T200 $(sparc_ONLY)link \ @@ -568,8 +584,10 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/lib/libpcp.so.1 \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-T200/lib/libsoftcrypto_psr.so.1 \ target=../../sun4v/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/sbin target=../sun4v/sbin -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V210 target=SUNW,Sun-Fire-V240 +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-T200/sbin \ + target=../sun4v/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V210 \ + target=SUNW,Sun-Fire-V240 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V215/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -608,7 +626,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/sbin/prtdiag \ target=../../sun4u/sbin/prtdiag $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V240/sbin/trapstat \ target=../../sun4u/sbin/trapstat -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V245 target=SUNW,Sun-Fire-V215 +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V245 \ + target=SUNW,Sun-Fire-V215 $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V250/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -683,7 +702,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/lib/libprtdiag_psr.so.1 \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V490/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V490/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V890/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -696,7 +716,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/lib/libprtdiag_psr.so.1 \ $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire-V890/lib/libsoftcrypto_psr.so.1 \ target=../../sun4u/lib/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/sbin target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire-V890/sbin \ + target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,Sun-Fire/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libsoftcrypto_psr.so.1 @@ -710,7 +731,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/sbin target=../sun4u/sbin $(sparc_ONLY)link \ path=usr/platform/SUNW,T5140/lib/$(ARCH64)/libsoftcrypto_psr.so.1 \ target=../../../sun4v/lib/$(ARCH64)/libsoftcrypto_psr.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fs target=../../sun4v/lib/fs +$(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fs \ + target=../../sun4v/lib/fs $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/libpcp.so.1 \ @@ -729,7 +751,8 @@ $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/libpcp.so \ target=../../sun4v/lib/libpcp.so $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/libpcp.so.1 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/libsoftcrypto_psr.so.1 \ +$(sparc_ONLY)link \ + path=usr/platform/SUNW,USBRDT-5240/lib/libsoftcrypto_psr.so.1 \ target=../../sun4v/lib/libsoftcrypto_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/sbin target=../sun4v/sbin $(sparc_ONLY)link \ diff --git a/usr/src/pkg/manifests/system-library-policykit.mf b/usr/src/pkg/manifests/system-library-policykit.mf index 0d99c32cc6..c2cfab6f9c 100644 --- a/usr/src/pkg/manifests/system-library-policykit.mf +++ b/usr/src/pkg/manifests/system-library-policykit.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/policykit@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value=PolicyKit set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/pkgconfig group=other diff --git a/usr/src/pkg/manifests/system-library-processor.mf b/usr/src/pkg/manifests/system-library-processor.mf index a4a8e9b324..a00a050fcd 100644 --- a/usr/src/pkg/manifests/system-library-processor.mf +++ b/usr/src/pkg/manifests/system-library-processor.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/processor@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Core Architecture" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(sparc_ONLY)dir path=etc group=sys $(sparc_ONLY)dir path=etc/flash group=sys $(sparc_ONLY)dir path=etc/flash/postcreation group=sys mode=0700 @@ -50,7 +48,8 @@ $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3010/lib/$(ARCH64) $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060 group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel/misc group=sys -$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel/misc/$(ARCH64) group=sys +$(sparc_ONLY)dir path=platform/SUNW,Netra-CP3060/kernel/misc/$(ARCH64) \ + group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12 group=sys $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/lib $(sparc_ONLY)dir path=platform/SUNW,Netra-T12/lib/$(ARCH64) @@ -178,33 +177,34 @@ $(sparc_ONLY)dir path=platform/sun4v/lib/libc_psr $(sparc_ONLY)file path=etc/flash/postdeployment/ttydefs.cleanup group=sys \ mode=0744 $(sparc_ONLY)file path=etc/flash/precreation/caplib group=sys mode=0500 -$(sparc_ONLY)file path=platform/SUNW,Netra-CP3060/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-T200/kernel/misc/$(ARCH64)/platmod \ - group=sys mode=0755 reboot-needed=true +$(sparc_ONLY)file \ + path=platform/SUNW,Netra-CP3060/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 +$(sparc_ONLY)file \ + path=platform/SUNW,Sun-Fire-T200/kernel/misc/$(ARCH64)/platmod group=sys \ + mode=0755 $(sparc_ONLY)file path=platform/sun4u-opl/lib/$(ARCH64)/libc_psr.so.1 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4u-opl/lib/libc_psr.so.1 reboot-needed=true $(sparc_ONLY)file path=platform/sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 \ - original_name=SUNWcar:platform/sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 \ - preserve=true reboot-needed=true + reboot-needed=true $(sparc_ONLY)file \ path=platform/sun4u-us3/lib/$(ARCH64)/libc_psr/libc_psr_hwcap1.so.1 \ reboot-needed=true $(sparc_ONLY)file \ path=platform/sun4u-us3/lib/$(ARCH64)/libc_psr/libc_psr_hwcap2.so.1 \ reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u-us3/lib/libc_psr.so.1 \ - original_name=SUNWcar:platform/sun4u-us3/lib/libc_psr.so.1 preserve=true \ - reboot-needed=true +$(sparc_ONLY)file path=platform/sun4u-us3/lib/libc_psr.so.1 reboot-needed=true $(sparc_ONLY)file path=platform/sun4u-us3/lib/libc_psr/libc_psr_hwcap1.so.1 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4u-us3/lib/libc_psr/libc_psr_hwcap2.so.1 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4u/lib/$(ARCH64)/libc_psr.so.1 \ reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/lib/$(ARCH64)/libmd_psr.so.1 \ - reboot-needed=true +$(sparc_ONLY)file path=platform/sun4u/lib/$(ARCH64)/libmd_psr.so.1 +# We force bootblks into a new BE because we want to make sure +# the user can recover from a pre-existing copy of the bootblk +# in the event that something goes horribly wrong. $(sparc_ONLY)file path=platform/sun4u/lib/fs/hsfs/bootblk group=sys mode=0444 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4u/lib/fs/ufs/bootblk group=sys mode=0444 \ @@ -212,18 +212,19 @@ $(sparc_ONLY)file path=platform/sun4u/lib/fs/ufs/bootblk group=sys mode=0444 \ $(sparc_ONLY)file path=platform/sun4u/lib/fs/zfs/bootblk group=sys mode=0444 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4u/lib/libc_psr.so.1 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4u/lib/libmd_psr.so.1 reboot-needed=true +$(sparc_ONLY)file path=platform/sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)file path=platform/sun4v/lib/$(ARCH64)/libc_psr.so.1 mode=0644 \ - original_name=SUNWcar:platform/sun4v/lib/$(ARCH64)/libc_psr.so.1 \ - preserve=true reboot-needed=true + reboot-needed=true $(sparc_ONLY)file \ path=platform/sun4v/lib/$(ARCH64)/libc_psr/libc_psr_hwcap1.so.1 \ reboot-needed=true $(sparc_ONLY)file \ path=platform/sun4v/lib/$(ARCH64)/libc_psr/libc_psr_hwcap2.so.1 \ reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/lib/$(ARCH64)/libmd_psr.so.1 \ - reboot-needed=true +$(sparc_ONLY)file path=platform/sun4v/lib/$(ARCH64)/libmd_psr.so.1 +# We force bootblks into a new BE because we want to make sure +# the user can recover from a pre-existing copy of the bootblk +# in the event that something goes horribly wrong. $(sparc_ONLY)file path=platform/sun4v/lib/fs/hsfs/bootblk group=sys mode=0444 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/lib/fs/ufs/bootblk group=sys mode=0444 \ @@ -231,13 +232,12 @@ $(sparc_ONLY)file path=platform/sun4v/lib/fs/ufs/bootblk group=sys mode=0444 \ $(sparc_ONLY)file path=platform/sun4v/lib/fs/zfs/bootblk group=sys mode=0444 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/lib/libc_psr.so.1 mode=0644 \ - original_name=SUNWcar:platform/sun4v/lib/libc_psr.so.1 preserve=true \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/lib/libc_psr/libc_psr_hwcap1.so.1 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/lib/libc_psr/libc_psr_hwcap2.so.1 \ reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/lib/libmd_psr.so.1 reboot-needed=true +$(sparc_ONLY)file path=platform/sun4v/lib/libmd_psr.so.1 $(i386_ONLY)legacy pkg=SUNWcar.i arch=$(ARCH).i86pc category=system \ desc="core software for a specific hardware platform group" \ hotline="Please contact your local service provider" \ @@ -333,31 +333,38 @@ $(sparc_ONLY)link path=platform/SUNW,Serverblade1/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-100/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-100/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-100/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-100/lib/libc_psr.so.1 \ target=../../sun4u/lib/libc_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-100/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1000/lib/$(ARCH64)/libc_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-1000/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1000/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-1000/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1000/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1000/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1500/lib/$(ARCH64)/libc_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-1500/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1500/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-1500/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1500/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-1500/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-2500/lib/$(ARCH64)/libc_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-2500/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Blade-2500/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Blade-2500/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-2500/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -366,9 +373,11 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-2500/lib/libmd_psr.so.1 \ $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-T6300 target=sun4v $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-T6320 target=sun4v $(sparc_ONLY)link path=platform/SUNW,Sun-Blade-T6340 target=sun4v -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-15000/lib/$(ARCH64)/libc_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-15000/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-15000/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-15000/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-15000/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -376,7 +385,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-15000/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-280R/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-280R/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-280R/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-280R/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -384,7 +394,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-280R/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-480R/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-480R/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-480R/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-480R/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -403,7 +414,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-T200/lib target=../sun4v/lib $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V210 target=SUNW,Sun-Fire-V240 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V215/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V215/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-V215/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V215/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -411,7 +423,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V215/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V240/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V240/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-V240/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V240/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -420,7 +433,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V240/lib/libmd_psr.so.1 \ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V245 target=SUNW,Sun-Fire-V215 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V250/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V250/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-V250/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V250/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -428,7 +442,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V250/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-V440/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -436,7 +451,8 @@ $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V440/lib/libmd_psr.so.1 \ target=../../sun4u/lib/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V445/lib/$(ARCH64)/libc_psr.so.1 \ target=../../../sun4u-us3/lib/$(ARCH64)/libc_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V445/lib/$(ARCH64)/libmd_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,Sun-Fire-V445/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 $(sparc_ONLY)link path=platform/SUNW,Sun-Fire-V445/lib/libc_psr.so.1 \ target=../../sun4u-us3/lib/libc_psr.so.1 @@ -546,7 +562,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/libc_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/libc_psr.so.1 \ target=../../sun4u/lib/libc_psr.so.1 $(sparc_ONLY)link \ path=platform/SUNW,UltraSPARC-IIe-NetraCT-40/lib/libmd_psr.so.1 \ @@ -557,7 +574,8 @@ $(sparc_ONLY)link \ $(sparc_ONLY)link \ path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/$(ARCH64)/libmd_psr.so.1 \ target=../../../sun4u/lib/$(ARCH64)/libmd_psr.so.1 -$(sparc_ONLY)link path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/libc_psr.so.1 \ +$(sparc_ONLY)link \ + path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/libc_psr.so.1 \ target=../../sun4u/lib/libc_psr.so.1 $(sparc_ONLY)link \ path=platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib/libmd_psr.so.1 \ diff --git a/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.mf b/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.mf index 42bb412f3c..7521386066 100644 --- a/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.mf +++ b/usr/src/pkg/manifests/system-library-security-gss-diffie-hellman.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -29,9 +28,9 @@ set name=pkg.fmri \ set name=pkg.description \ value="GSS-API mechanism libraries for NIS+ extended Diffie-Hellman" set name=pkg.summary value="GSS Diffie-Hellman" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-security-gss-spnego.mf b/usr/src/pkg/manifests/system-library-security-gss-spnego.mf index bb9bef411b..ec1b293b0d 100644 --- a/usr/src/pkg/manifests/system-library-security-gss-spnego.mf +++ b/usr/src/pkg/manifests/system-library-security-gss-spnego.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/security/gss/spnego@$(PKGVERS) set name=pkg.description value="SPNEGO GSS-API Mechanism" set name=pkg.summary value="SPNEGO GSS-API Mechanism" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-security-gss.mf b/usr/src/pkg/manifests/system-library-security-gss.mf index 49591eae1b..af247359b8 100644 --- a/usr/src/pkg/manifests/system-library-security-gss.mf +++ b/usr/src/pkg/manifests/system-library-security-gss.mf @@ -20,17 +20,16 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/security/gss@$(PKGVERS) set name=pkg.description \ value="Generic Security Service Application Program Interface, Version 2 - user" set name=pkg.summary value="GSSAPI V2" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-security-libsasl.mf b/usr/src/pkg/manifests/system-library-security-libsasl.mf index 3d79acad5c..4efc0ffcac 100644 --- a/usr/src/pkg/manifests/system-library-security-libsasl.mf +++ b/usr/src/pkg/manifests/system-library-security-libsasl.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/security/libsasl@$(PKGVERS) @@ -32,7 +31,6 @@ set name=pkg.summary \ set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-security-rpcsec.mf b/usr/src/pkg/manifests/system-library-security-rpcsec.mf index 085192658d..178901a98a 100644 --- a/usr/src/pkg/manifests/system-library-security-rpcsec.mf +++ b/usr/src/pkg/manifests/system-library-security-rpcsec.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/security/rpcsec@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value=RPCSEC_GSS set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf index 1852c2b1c6..f0dfd4d299 100644 --- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf +++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-hbaapi.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -32,8 +31,7 @@ set name=pkg.summary value="Common Fibre Channel HBA API Library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf b/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf index def7db4da2..dfb3b84f5f 100644 --- a/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf +++ b/usr/src/pkg/manifests/system-library-storage-fibre-channel-libsun_fc.mf @@ -20,19 +20,18 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/system/library/storage/fibre-channel/libsun_fc@$(PKGVERS) -set name=pkg.description value="SNIA HBA library for Sun Fibre Channel adapters" +set name=pkg.description \ + value="SNIA HBA library for Sun Fibre Channel adapters" set name=pkg.summary value="Sun Fibre Channel Host Bus Adapter Library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf index 25d67b3e95..53c7115bdc 100644 --- a/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf +++ b/usr/src/pkg/manifests/system-library-storage-ima-header-ima.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/storage/ima/header-ima@$(PKGVERS) @@ -31,8 +30,7 @@ set name=pkg.summary value="Solaris IMA Common Library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-library-storage-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima.mf index d40a5ca682..b06950ea9f 100644 --- a/usr/src/pkg/manifests/system-library-storage-ima.mf +++ b/usr/src/pkg/manifests/system-library-storage-ima.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/storage/ima@$(PKGVERS) @@ -31,8 +30,7 @@ set name=pkg.summary value="Solaris IMA Software Initiator Plugin" set name=info.classification \ value="org.opensolaris.category.2008:Applications/Plug-ins and Run-times" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf index 817a1a7c17..4edcc7b263 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/storage/libmpapi@$(PKGVERS) @@ -31,23 +30,17 @@ set name=pkg.summary value="SNIA Multipath Management API Common Library" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/$(ARCH64) opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/$(ARCH64) variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/include file path=etc/mpapi.conf original_name=SUNWmpapi:etc/mpapi.conf preserve=true -file path=lib/$(ARCH64)/libMPAPI.so.1 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/$(ARCH64)/llib-lMPAPI.ln opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/libMPAPI.so.1 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/llib-lMPAPI opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/llib-lMPAPI.ln opensolaris.zone=global \ - variant.opensolaris.zone=global +file path=lib/$(ARCH64)/libMPAPI.so.1 variant.opensolaris.zone=global +file path=lib/$(ARCH64)/llib-lMPAPI.ln variant.opensolaris.zone=global +file path=lib/libMPAPI.so.1 variant.opensolaris.zone=global +file path=lib/llib-lMPAPI variant.opensolaris.zone=global +file path=lib/llib-lMPAPI.ln variant.opensolaris.zone=global file path=usr/include/mpapi-sun.h file path=usr/include/mpapi.h legacy pkg=SUNWmpapi arch=$(ARCH) category=system \ @@ -64,8 +57,7 @@ license cr_Sun license=cr_Sun license lib/mpapi/libmpapi/THIRDPARTYLICENSE \ license=lib/mpapi/libmpapi/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL -link path=lib/$(ARCH64)/libMPAPI.so opensolaris.zone=global target=libMPAPI.so.1 \ - variant.opensolaris.zone=global -link path=lib/libMPAPI.so opensolaris.zone=global target=libMPAPI.so.1 \ +link path=lib/$(ARCH64)/libMPAPI.so target=libMPAPI.so.1 \ variant.opensolaris.zone=global +link path=lib/libMPAPI.so target=libMPAPI.so.1 variant.opensolaris.zone=global depend fmri=system/library/storage/libmpscsi_vhci type=require diff --git a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf index a968aacc33..21bbde5b58 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf @@ -20,23 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/library/storage/libmpscsi_vhci@$(PKGVERS) set name=pkg.description \ value="SNIA MP API plugin library for the scsi_vhci driver" set name=pkg.summary value="Sun MP API library for the scsi_vhci driver" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=lib dir path=lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf b/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf index d6c49398de..46d2034861 100644 --- a/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf +++ b/usr/src/pkg/manifests/system-library-storage-scsi-plugin.mf @@ -20,13 +20,12 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/system/library/storage/scsi-plugin@0.5.11,5.11-0.134 +set name=pkg.fmri \ + value=pkg:/system/library/storage/scsi-plugin@0.5.11,5.11-0.134 set name=pkg.renamed value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal depend fmri=pkg:/system/library/storage/scsi-plugins@0.5.11,5.11-0.134 \ type=require diff --git a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf index a30665c401..0cb5ed4492 100644 --- a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf +++ b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf @@ -29,7 +29,6 @@ set name=pkg.summary value="SCSI/SES plugins" set name=info.classification \ value="org.opensolaris.category.2008:Applications/Plug-ins and Run-times" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/scsi @@ -52,11 +51,11 @@ legacy pkg=SUNWscsip arch=$(ARCH) category=system \ version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4200.so \ - target=SUN-Storage-J4400.so -link path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4200.so \ - target=SUN-Storage-J4400.so link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.1.so \ target=LSILOGIC-SASX28-A.0.so +link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/SUN-Storage-J4200.so \ + target=SUN-Storage-J4400.so link path=usr/lib/scsi/plugins/ses/vendor/LSILOGIC-SASX28-A.1.so \ target=LSILOGIC-SASX28-A.0.so +link path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4200.so \ + target=SUN-Storage-J4400.so diff --git a/usr/src/pkg/manifests/system-library-svm-rcm.mf b/usr/src/pkg/manifests/system-library-svm-rcm.mf index bdb03c2fbe..44d9503885 100644 --- a/usr/src/pkg/manifests/system-library-svm-rcm.mf +++ b/usr/src/pkg/manifests/system-library-svm-rcm.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/library/svm-rcm@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="SVM RCM Module" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/rcm @@ -39,7 +37,8 @@ dir path=usr/lib/rcm/modules file path=usr/lib/rcm/modules/SUNW_svm_rcm.so mode=0555 legacy pkg=SUNWmddr arch=$(ARCH) category=system \ desc="reconfiguration coordination manager module for SVM" \ - hotline="Please contact your local service provider" name="SVM RCM Module" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="SVM RCM Module" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf index 3eaeff95d2..eab0c4e053 100644 --- a/usr/src/pkg/manifests/system-library.mf +++ b/usr/src/pkg/manifests/system-library.mf @@ -29,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Core Solaris, (Shared Libs)" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal $(i386_ONLY)dir path=etc group=sys $(i386_ONLY)dir path=etc/flash group=sys $(i386_ONLY)dir path=etc/flash/postcreation group=sys mode=0700 @@ -74,10 +73,10 @@ dir path=usr/lib/scsi/plugins/ses/framework/$(ARCH64) dir path=usr/lib/scsi/plugins/ses/vendor $(sparc_ONLY)dir path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64) dir path=usr/lib/scsi/plugins/smp -dir path=usr/lib/scsi/plugins/smp/framework -dir path=usr/lib/scsi/plugins/smp/framework/$(ARCH64) dir path=usr/lib/scsi/plugins/smp/engine dir path=usr/lib/scsi/plugins/smp/engine/$(ARCH64) +dir path=usr/lib/scsi/plugins/smp/framework +dir path=usr/lib/scsi/plugins/smp/framework/$(ARCH64) dir path=usr/lib/security dir path=usr/lib/security/$(ARCH64) dir path=usr/xpg4 @@ -150,14 +149,14 @@ file path=lib/$(ARCH64)/nss_files.so.1 file path=lib/$(ARCH64)/nss_nis.so.1 file path=lib/$(ARCH64)/nss_user.so.1 file path=lib/c_synonyms.so.1 +file path=lib/crypto/$(ARCH64)/kmf_mapper_cn.so.1 file path=lib/crypto/$(ARCH64)/kmf_nss.so.1 file path=lib/crypto/$(ARCH64)/kmf_openssl.so.1 file path=lib/crypto/$(ARCH64)/kmf_pkcs11.so.1 +file path=lib/crypto/kmf_mapper_cn.so.1 file path=lib/crypto/kmf_nss.so.1 file path=lib/crypto/kmf_openssl.so.1 file path=lib/crypto/kmf_pkcs11.so.1 -file path=lib/crypto/$(ARCH64)/kmf_mapper_cn.so.1 -file path=lib/crypto/kmf_mapper_cn.so.1 file path=lib/ld.so.1 file path=lib/libadm.so.1 file path=lib/libaio.so.1 @@ -371,9 +370,9 @@ file path=usr/lib/libzoneinfo.so.1 file path=usr/lib/nss_ad.so.1 file path=usr/lib/nss_ldap.so.1 file path=usr/lib/passwdutil.so.1 -file path=usr/lib/python2.4/vendor-packages/solaris/misc.so file path=usr/lib/python2.4/vendor-packages/solaris/__init__.py file path=usr/lib/python2.4/vendor-packages/solaris/__init__.pyc +file path=usr/lib/python2.4/vendor-packages/solaris/misc.so file path=usr/lib/raidcfg/$(ARCH64)/mpt.so.1 file path=usr/lib/raidcfg/mpt.so.1 file path=usr/lib/scsi/$(ARCH64)/libscsi.so.1 @@ -384,12 +383,12 @@ file path=usr/lib/scsi/libses.so.1 file path=usr/lib/scsi/libsmp.so.1 file path=usr/lib/scsi/plugins/scsi/engines/$(ARCH64)/uscsi.so file path=usr/lib/scsi/plugins/scsi/engines/uscsi.so -file path=usr/lib/scsi/plugins/smp/engine/$(ARCH64)/usmp.so -file path=usr/lib/scsi/plugins/smp/engine/usmp.so file path=usr/lib/scsi/plugins/ses/framework/$(ARCH64)/libses.so file path=usr/lib/scsi/plugins/ses/framework/$(ARCH64)/ses2.so file path=usr/lib/scsi/plugins/ses/framework/libses.so file path=usr/lib/scsi/plugins/ses/framework/ses2.so +file path=usr/lib/scsi/plugins/smp/engine/$(ARCH64)/usmp.so +file path=usr/lib/scsi/plugins/smp/engine/usmp.so file path=usr/lib/scsi/plugins/smp/framework/$(ARCH64)/sas2.so file path=usr/lib/scsi/plugins/smp/framework/sas2.so file path=usr/lib/security/$(ARCH64)/crypt_bsdbf.so.1 @@ -486,7 +485,8 @@ license lib/libkmf/THIRDPARTYLICENSE license=lib/libkmf/THIRDPARTYLICENSE license lib/libldap5/THIRDPARTYLICENSE license=lib/libldap5/THIRDPARTYLICENSE license lib/libmp/common/THIRDPARTYLICENSE \ license=lib/libmp/common/THIRDPARTYLICENSE -license lib/libresolv/THIRDPARTYLICENSE license=lib/libresolv/THIRDPARTYLICENSE +license lib/libresolv/THIRDPARTYLICENSE \ + license=lib/libresolv/THIRDPARTYLICENSE license lib/libresolv2/THIRDPARTYLICENSE \ license=lib/libresolv2/THIRDPARTYLICENSE license lib/libshell/THIRDPARTYLICENSE license=lib/libshell/THIRDPARTYLICENSE @@ -636,7 +636,8 @@ link path=usr/ccs/lib/$(ARCH64)/libform.so \ target=../../../lib/$(ARCH64)/libform.so.1 link path=usr/ccs/lib/$(ARCH64)/libgen.so \ target=../../../../lib/$(ARCH64)/libgen.so.1 -link path=usr/ccs/lib/$(ARCH64)/libl.so target=../../../lib/$(ARCH64)/libl.so.1 +link path=usr/ccs/lib/$(ARCH64)/libl.so \ + target=../../../lib/$(ARCH64)/libl.so.1 link path=usr/ccs/lib/$(ARCH64)/libmalloc.so \ target=../../../lib/$(ARCH64)/libmalloc.so.1 link path=usr/ccs/lib/$(ARCH64)/libmenu.so \ @@ -647,7 +648,8 @@ link path=usr/ccs/lib/$(ARCH64)/libtermcap.so \ target=../../../../lib/$(ARCH64)/libcurses.so.1 link path=usr/ccs/lib/$(ARCH64)/libtermlib.so \ target=../../../../lib/$(ARCH64)/libcurses.so.1 -link path=usr/ccs/lib/$(ARCH64)/liby.so target=../../../lib/$(ARCH64)/liby.so.1 +link path=usr/ccs/lib/$(ARCH64)/liby.so \ + target=../../../lib/$(ARCH64)/liby.so.1 link path=usr/ccs/lib/libcurses.so target=../../../lib/libcurses.so.1 link path=usr/ccs/lib/libform.so target=../../lib/libform.so.1 link path=usr/ccs/lib/libgen.so target=../../../lib/libgen.so.1 @@ -662,17 +664,20 @@ link path=usr/lib/$(ARCH64)/lib300.so target=./lib300.so.1 link path=usr/lib/$(ARCH64)/lib300s.so target=./lib300s.so.1 link path=usr/lib/$(ARCH64)/lib4014.so target=./lib4014.so.1 link path=usr/lib/$(ARCH64)/lib450.so target=./lib450.so.1 -link path=usr/lib/$(ARCH64)/libadm.so target=../../../lib/$(ARCH64)/libadm.so.1 +link path=usr/lib/$(ARCH64)/libadm.so \ + target=../../../lib/$(ARCH64)/libadm.so.1 link path=usr/lib/$(ARCH64)/libadm.so.1 \ target=../../../lib/$(ARCH64)/libadm.so.1 link path=usr/lib/$(ARCH64)/libadutils.so target=./libadutils.so.1 -link path=usr/lib/$(ARCH64)/libaio.so target=../../../lib/$(ARCH64)/libaio.so.1 +link path=usr/lib/$(ARCH64)/libaio.so \ + target=../../../lib/$(ARCH64)/libaio.so.1 link path=usr/lib/$(ARCH64)/libaio.so.1 \ target=../../../lib/$(ARCH64)/libaio.so.1 link path=usr/lib/$(ARCH64)/libavl.so.1 \ target=../../../lib/$(ARCH64)/libavl.so.1 link path=usr/lib/$(ARCH64)/libbsdmalloc.so target=libbsdmalloc.so.1 -link path=usr/lib/$(ARCH64)/libbsm.so target=../../../lib/$(ARCH64)/libbsm.so.1 +link path=usr/lib/$(ARCH64)/libbsm.so \ + target=../../../lib/$(ARCH64)/libbsm.so.1 link path=usr/lib/$(ARCH64)/libbsm.so.1 \ target=../../../lib/$(ARCH64)/libbsm.so.1 link path=usr/lib/$(ARCH64)/libc.so target=../../../lib/$(ARCH64)/libc.so.1 @@ -695,7 +700,8 @@ link path=usr/lib/$(ARCH64)/libcrypt_d.so target=./libcrypt.so link path=usr/lib/$(ARCH64)/libcrypt_d.so.1 target=./libcrypt.so.1 link path=usr/lib/$(ARCH64)/libcrypt_i.so target=./libcrypt.so link path=usr/lib/$(ARCH64)/libcrypt_i.so.1 target=./libcrypt.so.1 -link path=usr/lib/$(ARCH64)/libctf.so target=../../../lib/$(ARCH64)/libctf.so.1 +link path=usr/lib/$(ARCH64)/libctf.so \ + target=../../../lib/$(ARCH64)/libctf.so.1 link path=usr/lib/$(ARCH64)/libctf.so.1 \ target=../../../lib/$(ARCH64)/libctf.so.1 link path=usr/lib/$(ARCH64)/libcurses.so \ @@ -716,7 +722,8 @@ link path=usr/lib/$(ARCH64)/libdevinfo.so.1 \ target=../../../lib/$(ARCH64)/libdevinfo.so.1 link path=usr/lib/$(ARCH64)/libdisasm.so target=libdisasm.so.1 link path=usr/lib/$(ARCH64)/libdl.so target=../../../lib/$(ARCH64)/libdl.so.1 -link path=usr/lib/$(ARCH64)/libdl.so.1 target=../../../lib/$(ARCH64)/libdl.so.1 +link path=usr/lib/$(ARCH64)/libdl.so.1 \ + target=../../../lib/$(ARCH64)/libdl.so.1 link path=usr/lib/$(ARCH64)/libdlpi.so \ target=../../../lib/$(ARCH64)/libdlpi.so.1 link path=usr/lib/$(ARCH64)/libdlpi.so.1 \ @@ -725,10 +732,12 @@ link path=usr/lib/$(ARCH64)/libdoor.so \ target=../../../lib/$(ARCH64)/libdoor.so.1 link path=usr/lib/$(ARCH64)/libdoor.so.1 \ target=../../../lib/$(ARCH64)/libdoor.so.1 -link path=usr/lib/$(ARCH64)/libefi.so target=../../../lib/$(ARCH64)/libefi.so.1 +link path=usr/lib/$(ARCH64)/libefi.so \ + target=../../../lib/$(ARCH64)/libefi.so.1 link path=usr/lib/$(ARCH64)/libefi.so.1 \ target=../../../lib/$(ARCH64)/libefi.so.1 -link path=usr/lib/$(ARCH64)/libelf.so target=../../../lib/$(ARCH64)/libelf.so.1 +link path=usr/lib/$(ARCH64)/libelf.so \ + target=../../../lib/$(ARCH64)/libelf.so.1 link path=usr/lib/$(ARCH64)/libelf.so.1 \ target=../../../lib/$(ARCH64)/libelf.so.1 link path=usr/lib/$(ARCH64)/libexacct.so target=libexacct.so.1 @@ -737,7 +746,8 @@ $(i386_ONLY)link path=usr/lib/$(ARCH64)/libfdisk.so \ $(i386_ONLY)link path=usr/lib/$(ARCH64)/libfdisk.so.1 \ target=../../../lib/$(ARCH64)/libfdisk.so.1 link path=usr/lib/$(ARCH64)/libform.so target=libform.so.1 -link path=usr/lib/$(ARCH64)/libgen.so target=../../../lib/$(ARCH64)/libgen.so.1 +link path=usr/lib/$(ARCH64)/libgen.so \ + target=../../../lib/$(ARCH64)/libgen.so.1 link path=usr/lib/$(ARCH64)/libgen.so.1 \ target=../../../lib/$(ARCH64)/libgen.so.1 link path=usr/lib/$(ARCH64)/libhotplug.so target=libhotplug.so.1 @@ -765,23 +775,28 @@ link path=usr/lib/$(ARCH64)/libmail.so target=libmail.so.1 link path=usr/lib/$(ARCH64)/libmalloc.so target=libmalloc.so.1 link path=usr/lib/$(ARCH64)/libmapmalloc.so target=libmapmalloc.so.1 link path=usr/lib/$(ARCH64)/libmd.so target=../../../lib/$(ARCH64)/libmd.so.1 -link path=usr/lib/$(ARCH64)/libmd.so.1 target=../../../lib/$(ARCH64)/libmd.so.1 -link path=usr/lib/$(ARCH64)/libmd5.so target=../../../lib/$(ARCH64)/libmd5.so.1 +link path=usr/lib/$(ARCH64)/libmd.so.1 \ + target=../../../lib/$(ARCH64)/libmd.so.1 +link path=usr/lib/$(ARCH64)/libmd5.so \ + target=../../../lib/$(ARCH64)/libmd5.so.1 link path=usr/lib/$(ARCH64)/libmd5.so.1 \ target=../../../lib/$(ARCH64)/libmd5.so.1 link path=usr/lib/$(ARCH64)/libmenu.so target=libmenu.so.1 link path=usr/lib/$(ARCH64)/libmp.so target=../../../lib/$(ARCH64)/libmp.so.2 -link path=usr/lib/$(ARCH64)/libmp.so.2 target=../../../lib/$(ARCH64)/libmp.so.2 +link path=usr/lib/$(ARCH64)/libmp.so.2 \ + target=../../../lib/$(ARCH64)/libmp.so.2 link path=usr/lib/$(ARCH64)/libmtmalloc.so target=libmtmalloc.so.1 link path=usr/lib/$(ARCH64)/libnls.so target=libnls.so.1 -link path=usr/lib/$(ARCH64)/libnsl.so target=../../../lib/$(ARCH64)/libnsl.so.1 +link path=usr/lib/$(ARCH64)/libnsl.so \ + target=../../../lib/$(ARCH64)/libnsl.so.1 link path=usr/lib/$(ARCH64)/libnsl.so.1 \ target=../../../lib/$(ARCH64)/libnsl.so.1 link path=usr/lib/$(ARCH64)/libnvpair.so \ target=../../../lib/$(ARCH64)/libnvpair.so.1 link path=usr/lib/$(ARCH64)/libnvpair.so.1 \ target=../../../lib/$(ARCH64)/libnvpair.so.1 -link path=usr/lib/$(ARCH64)/libpam.so target=../../../lib/$(ARCH64)/libpam.so.1 +link path=usr/lib/$(ARCH64)/libpam.so \ + target=../../../lib/$(ARCH64)/libpam.so.1 link path=usr/lib/$(ARCH64)/libpam.so.1 \ target=../../../lib/$(ARCH64)/libpam.so.1 link path=usr/lib/$(ARCH64)/libpanel.so target=libpanel.so.1 @@ -800,7 +815,8 @@ link path=usr/lib/$(ARCH64)/libpthread.so \ target=../../../lib/$(ARCH64)/libpthread.so.1 link path=usr/lib/$(ARCH64)/libpthread.so.1 \ target=../../../lib/$(ARCH64)/libpthread.so.1 -link path=usr/lib/$(ARCH64)/librcm.so target=../../../lib/$(ARCH64)/librcm.so.1 +link path=usr/lib/$(ARCH64)/librcm.so \ + target=../../../lib/$(ARCH64)/librcm.so.1 link path=usr/lib/$(ARCH64)/librcm.so.1 \ target=../../../lib/$(ARCH64)/librcm.so.1 link path=usr/lib/$(ARCH64)/libreparse.so target=libreparse.so.1 @@ -817,19 +833,22 @@ link path=usr/lib/$(ARCH64)/librpcsvc.so \ link path=usr/lib/$(ARCH64)/librpcsvc.so.1 \ target=../../../lib/$(ARCH64)/librpcsvc.so.1 link path=usr/lib/$(ARCH64)/librt.so target=../../../lib/$(ARCH64)/librt.so.1 -link path=usr/lib/$(ARCH64)/librt.so.1 target=../../../lib/$(ARCH64)/librt.so.1 +link path=usr/lib/$(ARCH64)/librt.so.1 \ + target=../../../lib/$(ARCH64)/librt.so.1 link path=usr/lib/$(ARCH64)/librtld.so.1 \ target=../../../lib/$(ARCH64)/librtld.so.1 link path=usr/lib/$(ARCH64)/librtld_db.so \ target=../../../lib/$(ARCH64)/librtld_db.so.1 link path=usr/lib/$(ARCH64)/librtld_db.so.1 \ target=../../../lib/$(ARCH64)/librtld_db.so.1 -link path=usr/lib/$(ARCH64)/libscf.so target=../../../lib/$(ARCH64)/libscf.so.1 +link path=usr/lib/$(ARCH64)/libscf.so \ + target=../../../lib/$(ARCH64)/libscf.so.1 link path=usr/lib/$(ARCH64)/libscf.so.1 \ target=../../../lib/$(ARCH64)/libscf.so.1 link path=usr/lib/$(ARCH64)/libsched.so target=libsched.so.1 link path=usr/lib/$(ARCH64)/libsctp.so target=./libsctp.so.1 -link path=usr/lib/$(ARCH64)/libsec.so target=../../../lib/$(ARCH64)/libsec.so.1 +link path=usr/lib/$(ARCH64)/libsec.so \ + target=../../../lib/$(ARCH64)/libsec.so.1 link path=usr/lib/$(ARCH64)/libsec.so.1 \ target=../../../lib/$(ARCH64)/libsec.so.1 link path=usr/lib/$(ARCH64)/libsecdb.so \ @@ -1106,10 +1125,14 @@ link path=usr/lib/scsi/libscsi.so target=./libscsi.so.1 link path=usr/lib/scsi/libses.so target=./libses.so.1 link path=usr/lib/scsi/libsmp.so target=./libsmp.so.1 link path=usr/lib/security/$(ARCH64)/crypt_bsdbf.so target=./crypt_bsdbf.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_bsdmd5.so target=./crypt_bsdmd5.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_sha256.so target=./crypt_sha256.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_sha512.so target=./crypt_sha512.so.1 -link path=usr/lib/security/$(ARCH64)/crypt_sunmd5.so target=./crypt_sunmd5.so.1 +link path=usr/lib/security/$(ARCH64)/crypt_bsdmd5.so \ + target=./crypt_bsdmd5.so.1 +link path=usr/lib/security/$(ARCH64)/crypt_sha256.so \ + target=./crypt_sha256.so.1 +link path=usr/lib/security/$(ARCH64)/crypt_sha512.so \ + target=./crypt_sha512.so.1 +link path=usr/lib/security/$(ARCH64)/crypt_sunmd5.so \ + target=./crypt_sunmd5.so.1 link path=usr/lib/security/$(ARCH64)/pam_allow.so target=./pam_allow.so.1 link path=usr/lib/security/$(ARCH64)/pam_authtok_check.so \ target=./pam_authtok_check.so.1 @@ -1154,9 +1177,11 @@ link path=usr/lib/security/crypt_sha256.so target=./crypt_sha256.so.1 link path=usr/lib/security/crypt_sha512.so target=./crypt_sha512.so.1 link path=usr/lib/security/crypt_sunmd5.so target=./crypt_sunmd5.so.1 link path=usr/lib/security/pam_allow.so target=./pam_allow.so.1 -link path=usr/lib/security/pam_authtok_check.so target=./pam_authtok_check.so.1 +link path=usr/lib/security/pam_authtok_check.so \ + target=./pam_authtok_check.so.1 link path=usr/lib/security/pam_authtok_get.so target=./pam_authtok_get.so.1 -link path=usr/lib/security/pam_authtok_store.so target=./pam_authtok_store.so.1 +link path=usr/lib/security/pam_authtok_store.so \ + target=./pam_authtok_store.so.1 link path=usr/lib/security/pam_deny.so target=./pam_deny.so.1 link path=usr/lib/security/pam_dhkeys.so target=./pam_dhkeys.so.1 link path=usr/lib/security/pam_dial_auth.so target=./pam_dial_auth.so.1 diff --git a/usr/src/pkg/manifests/system-management-intel-amt.mf b/usr/src/pkg/manifests/system-management-intel-amt.mf index 5d16e2696a..a2b65f5c0c 100644 --- a/usr/src/pkg/manifests/system-management-intel-amt.mf +++ b/usr/src/pkg/manifests/system-management-intel-amt.mf @@ -20,10 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/management/intel-amt@$(PKGVERS) set name=pkg.description \ value="Solaris support for Intel Active Management Technology" @@ -31,17 +36,16 @@ set name=pkg.summary value="Solaris support for Intel AMT" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys driver name=heci perms="* 0644 root sys" \ alias=pci8086,2974 \ alias=pci8086,2984 \ @@ -53,9 +57,9 @@ driver name=heci perms="* 0644 root sys" \ alias=pci8086,2e14 file path=kernel/drv/$(ARCH64)/heci group=sys file path=kernel/drv/heci group=sys +file path=lib/svc/manifest/network/lms.xml group=sys mode=0444 file path=lib/svc/method/svc-lms mode=0555 file path=usr/lib/lms mode=0555 -file path=lib/svc/manifest/network/lms.xml group=sys mode=0444 legacy pkg=SUNWamt arch=$(ARCH) category=system \ desc="Solaris support for Intel Active Management Technology" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-management-pcitool.mf b/usr/src/pkg/manifests/system-management-pcitool.mf index e47fdd731d..5c7a1d0e62 100644 --- a/usr/src/pkg/manifests/system-management-pcitool.mf +++ b/usr/src/pkg/manifests/system-management-pcitool.mf @@ -20,24 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/management/pcitool@$(PKGVERS) set name=pkg.description \ value="Administrative tools to modify the pci/pcie fabric" -set name=pkg.summary value="Administrative tools to modify the pci/pcie fabric" +set name=pkg.summary \ + value="Administrative tools to modify the pci/pcie fabric" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sbin dir path=usr/share group=sys diff --git a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf index f24475882a..bd56804d7e 100644 --- a/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf +++ b/usr/src/pkg/manifests/system-management-snmp-sea-sea-config.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/management/snmp/sea/sea-config@$(PKGVERS) @@ -32,20 +31,19 @@ set name=pkg.summary \ set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=etc/snmp group=sys dir path=etc/snmp/conf group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/application group=sys +dir path=lib/svc/manifest/application/management group=sys dir path=lib/svc/method dir path=var group=sys dir path=var/snmp group=sys dir path=var/snmp/mib group=sys -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/application group=sys -dir path=lib/svc/manifest/application/management group=sys file path=etc/init.d/init.snmpdx group=sys mode=0744 file path=etc/snmp/conf/enterprises.oid group=sys file path=etc/snmp/conf/mibiisa.reg group=sys \ @@ -60,10 +58,11 @@ file path=etc/snmp/conf/snmpdx.reg group=sys \ original_name=SUNWsacom:etc/snmp/conf/snmpdx.reg preserve=true file path=etc/snmp/conf/snmpdx.rsrc group=sys \ original_name=SUNWsacom:etc/snmp/conf/snmpdx.rsrc preserve=true +file path=lib/svc/manifest/application/management/snmpdx.xml group=sys \ + mode=0444 file path=lib/svc/method/svc-snmpdx mode=0555 file path=var/snmp/mib/snmpdx.mib group=sys file path=var/snmp/mib/sun.mib group=sys -file path=lib/svc/manifest/application/management/snmpdx.xml group=sys mode=0444 legacy pkg=SUNWsacom arch=$(ARCH) category=system \ desc="Solstice Enterprise Agents 1.0.3 files for root file system" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-management-snmp-sea.mf b/usr/src/pkg/manifests/system-management-snmp-sea.mf index 04c1aab40c..cddd8eaa47 100644 --- a/usr/src/pkg/manifests/system-management-snmp-sea.mf +++ b/usr/src/pkg/manifests/system-management-snmp-sea.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/management/snmp/sea@$(PKGVERS) @@ -32,7 +31,6 @@ set name=pkg.summary \ set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) diff --git a/usr/src/pkg/manifests/system-management-wbem-data-management.mf b/usr/src/pkg/manifests/system-management-wbem-data-management.mf index 8cfa73f09a..b7f5ca62fd 100644 --- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/management/wbem/data-management@$(PKGVERS) @@ -38,7 +37,6 @@ set name=info.classification \ # set name=org.opensolaris.nodepend value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/sadm diff --git a/usr/src/pkg/manifests/system-management-wbem-resource-management.mf b/usr/src/pkg/manifests/system-management-wbem-resource-management.mf index 117a0d6a13..dca36211de 100644 --- a/usr/src/pkg/manifests/system-management-wbem-resource-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-resource-management.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -31,7 +30,6 @@ set name=pkg.summary value="Resource Management WBEM Instrumentation" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/sadm dir path=usr/sadm/lib @@ -43,7 +41,8 @@ dir path=usr/sadm/lib/wbem/com/sun group=sys dir path=usr/sadm/lib/wbem/com/sun/wbem group=sys dir path=usr/sadm/lib/wbem/com/sun/wbem/solarisprovider group=sys dir path=usr/sadm/lib/wbem/com/sun/wbem/solarisprovider/srm group=sys -dir path=usr/sadm/lib/wbem/com/sun/wbem/solarisprovider/srm/resources group=sys +dir path=usr/sadm/lib/wbem/com/sun/wbem/solarisprovider/srm/resources \ + group=sys dir path=usr/sadm/mof group=sys file path=usr/sadm/lib/wbem/$(ARCH32)/rds mode=0555 file path=usr/sadm/lib/wbem/$(ARCH64)/rds mode=0555 diff --git a/usr/src/pkg/manifests/system-network-console.mf b/usr/src/pkg/manifests/system-network-console.mf index ff65074212..0cce70fff2 100644 --- a/usr/src/pkg/manifests/system-network-console.mf +++ b/usr/src/pkg/manifests/system-network-console.mf @@ -20,24 +20,24 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network-console@$(PKGVERS) set name=pkg.description value="Network Console" set name=pkg.summary value="Network Console" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=sparc -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=platform group=sys dir path=platform/SUNW,Sun-Fire-15000 group=sys @@ -50,33 +50,27 @@ dir path=platform/SUNW,Ultra-Enterprise-10000/kernel group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64) group=sys dir path=platform/SUNW,Ultra-Enterprise-10000/lib -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys driver name=cvc perms="* 0600 root sys" driver name=cvcredir perms="* 0600 root sys" +file path=lib/svc/manifest/system/cvc.xml group=sys mode=0444 file path=lib/svc/method/svc-cvcd mode=0555 file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/cvc group=sys file path=platform/SUNW,Sun-Fire-15000/kernel/drv/$(ARCH64)/cvcredir group=sys -file path=platform/SUNW,Sun-Fire-15000/kernel/drv/cvc.conf group=sys \ - reboot-needed=false -file path=platform/SUNW,Sun-Fire-15000/kernel/drv/cvcredir.conf group=sys \ - reboot-needed=false -file path=platform/SUNW,Sun-Fire-15000/lib/cvcd group=sys mode=0755 \ - reboot-needed=true +file path=platform/SUNW,Sun-Fire-15000/kernel/drv/cvc.conf group=sys +file path=platform/SUNW,Sun-Fire-15000/kernel/drv/cvcredir.conf group=sys +file path=platform/SUNW,Sun-Fire-15000/lib/cvcd group=sys mode=0755 file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64)/cvc \ group=sys file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64)/cvcredir \ group=sys -file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/cvc.conf group=sys \ - reboot-needed=false +file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/cvc.conf group=sys file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/cvcredir.conf \ - group=sys reboot-needed=false -file path=platform/SUNW,Ultra-Enterprise-10000/lib/cvcd group=sys mode=0700 \ - reboot-needed=true -file path=lib/svc/manifest/system/cvc.xml group=sys mode=0444 + group=sys +file path=platform/SUNW,Ultra-Enterprise-10000/lib/cvcd group=sys mode=0700 legacy pkg=SUNWcvc.u arch=$(ARCH).sun4u category=system desc="Network Console" \ - hotline="Please contact your local service provider" name="Network Console" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="Network Console" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 legacy pkg=SUNWcvcr.u arch=$(ARCH).sun4u category=system \ desc="Network Console daemon" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf b/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf index 20a25f9e4b..ee59bff686 100644 --- a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf +++ b/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf @@ -20,88 +20,66 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network/http-cache-accelerator@$(PKGVERS) set name=pkg.description \ value="components to enable the network cache and accelerator" set name=pkg.summary value="Solaris Network Cache and Accelerator" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/init.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/nca group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc0.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc1.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc2.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rcS.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/strmod group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/strmod/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/init.d group=sys +dir path=etc/nca group=sys +dir path=etc/rc0.d group=sys +dir path=etc/rc1.d group=sys +dir path=etc/rc2.d group=sys +dir path=etc/rcS.d group=sys +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +dir path=kernel/strmod group=sys +dir path=kernel/strmod/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/inet driver name=nca -file path=etc/init.d/ncakmod group=sys mode=0744 opensolaris.zone=global \ - original_name=SUNWnca:etc/init.d/ncakmod preserve=true \ - variant.opensolaris.zone=global -file path=etc/init.d/ncalogd group=sys mode=0744 opensolaris.zone=global \ - original_name=SUNWnca:etc/init.d/ncalogd preserve=true \ - variant.opensolaris.zone=global -file path=etc/nca/nca.if group=sys opensolaris.zone=global \ - original_name=SUNWnca:etc/nca/nca.if preserve=true \ - variant.opensolaris.zone=global -file path=etc/nca/ncakmod.conf group=sys opensolaris.zone=global \ - original_name=SUNWnca:etc/nca/ncakmod.conf preserve=true \ - variant.opensolaris.zone=global -file path=etc/nca/ncalogd.conf group=sys opensolaris.zone=global \ - original_name=SUNWnca:etc/nca/ncalogd.conf preserve=true \ - variant.opensolaris.zone=global -file path=etc/nca/ncaport.conf group=sys opensolaris.zone=global \ - original_name=SUNWnca:etc/nca/ncaport.conf preserve=true \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/nca group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/nca group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/nca.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global +file path=etc/init.d/ncakmod group=sys mode=0744 \ + original_name=SUNWnca:etc/init.d/ncakmod preserve=true +file path=etc/init.d/ncalogd group=sys mode=0744 \ + original_name=SUNWnca:etc/init.d/ncalogd preserve=true +file path=etc/nca/nca.if group=sys original_name=SUNWnca:etc/nca/nca.if \ + preserve=true +file path=etc/nca/ncakmod.conf group=sys \ + original_name=SUNWnca:etc/nca/ncakmod.conf preserve=true +file path=etc/nca/ncalogd.conf group=sys \ + original_name=SUNWnca:etc/nca/ncalogd.conf preserve=true +file path=etc/nca/ncaport.conf group=sys \ + original_name=SUNWnca:etc/nca/ncaport.conf preserve=true +file path=kernel/drv/$(ARCH64)/nca group=sys +$(i386_ONLY)file path=kernel/drv/nca group=sys +file path=kernel/drv/nca.conf group=sys file path=usr/bin/ncab2clf mode=0555 file path=usr/lib/$(ARCH64)/ncad_addr.so.1 file path=usr/lib/inet/ncaconfd mode=0555 file path=usr/lib/ncad_addr.so.1 -hardlink path=etc/rc0.d/K34ncalogd opensolaris.zone=global \ - target=../../etc/init.d/ncalogd variant.opensolaris.zone=global -hardlink path=etc/rc1.d/K34ncalogd opensolaris.zone=global \ - target=../../etc/init.d/ncalogd variant.opensolaris.zone=global -hardlink path=etc/rc2.d/S42ncakmod opensolaris.zone=global \ - target=../../etc/init.d/ncakmod variant.opensolaris.zone=global -hardlink path=etc/rc2.d/S94ncalogd opensolaris.zone=global \ - target=../../etc/init.d/ncalogd variant.opensolaris.zone=global -hardlink path=etc/rcS.d/K34ncalogd opensolaris.zone=global \ - target=../../etc/init.d/ncalogd variant.opensolaris.zone=global -hardlink path=kernel/strmod/$(ARCH64)/nca opensolaris.zone=global \ - target=../../../kernel/drv/$(ARCH64)/nca variant.opensolaris.zone=global -$(i386_ONLY)hardlink path=kernel/strmod/nca opensolaris.zone=global \ - target=../../kernel/drv/nca variant.opensolaris.zone=global +hardlink path=etc/rc0.d/K34ncalogd target=../../etc/init.d/ncalogd +hardlink path=etc/rc1.d/K34ncalogd target=../../etc/init.d/ncalogd +hardlink path=etc/rc2.d/S42ncakmod target=../../etc/init.d/ncakmod +hardlink path=etc/rc2.d/S94ncalogd target=../../etc/init.d/ncalogd +hardlink path=etc/rcS.d/K34ncalogd target=../../etc/init.d/ncalogd +hardlink path=kernel/strmod/$(ARCH64)/nca \ + target=../../../kernel/drv/$(ARCH64)/nca +$(i386_ONLY)hardlink path=kernel/strmod/nca target=../../kernel/drv/nca legacy pkg=SUNWncar arch=$(ARCH) category=system \ desc="core components to enable the network cache and accelerator" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf index 71fe1b1725..6042ecedf6 100644 --- a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf +++ b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf @@ -20,22 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network/ipqos/ipqos-config@$(PKGVERS) set name=pkg.description value="Solaris IP Quality of Service" set name=pkg.summary value="IP QoS" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/inet group=sys dir path=kernel group=sys @@ -44,19 +42,20 @@ dir path=kernel/ipp/$(ARCH64) group=sys file path=etc/inet/ipqosconf.1.sample group=sys mode=0444 file path=etc/inet/ipqosconf.2.sample group=sys mode=0444 file path=etc/inet/ipqosconf.3.sample group=sys mode=0444 -file path=kernel/ipp/$(ARCH64)/dlcosmk group=sys mode=0755 reboot-needed=true -file path=kernel/ipp/$(ARCH64)/dscpmk group=sys mode=0755 reboot-needed=true -file path=kernel/ipp/$(ARCH64)/flowacct group=sys mode=0755 reboot-needed=true -file path=kernel/ipp/$(ARCH64)/tokenmt group=sys mode=0755 reboot-needed=true -file path=kernel/ipp/$(ARCH64)/tswtclmt group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/ipp/dlcosmk group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/ipp/dscpmk group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/ipp/flowacct group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/ipp/tokenmt group=sys mode=0755 reboot-needed=true -$(i386_ONLY)file path=kernel/ipp/tswtclmt group=sys mode=0755 reboot-needed=true +file path=kernel/ipp/$(ARCH64)/dlcosmk group=sys mode=0755 +file path=kernel/ipp/$(ARCH64)/dscpmk group=sys mode=0755 +file path=kernel/ipp/$(ARCH64)/flowacct group=sys mode=0755 +file path=kernel/ipp/$(ARCH64)/tokenmt group=sys mode=0755 +file path=kernel/ipp/$(ARCH64)/tswtclmt group=sys mode=0755 +$(i386_ONLY)file path=kernel/ipp/dlcosmk group=sys mode=0755 +$(i386_ONLY)file path=kernel/ipp/dscpmk group=sys mode=0755 +$(i386_ONLY)file path=kernel/ipp/flowacct group=sys mode=0755 +$(i386_ONLY)file path=kernel/ipp/tokenmt group=sys mode=0755 +$(i386_ONLY)file path=kernel/ipp/tswtclmt group=sys mode=0755 legacy pkg=SUNWqos arch=$(ARCH) category=system \ desc="Solaris IP Quality of Service (Root)" \ - hotline="Please contact your local service provider" name="IP QoS, (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="IP QoS, (Root)" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-network-ipqos.mf b/usr/src/pkg/manifests/system-network-ipqos.mf index 5d6a0f4d49..e1b6c7319d 100644 --- a/usr/src/pkg/manifests/system-network-ipqos.mf +++ b/usr/src/pkg/manifests/system-network-ipqos.mf @@ -20,16 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network/ipqos@$(PKGVERS) set name=pkg.description value="Solaris IP Quality of Service" set name=pkg.summary value="IP QoS" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/ipp diff --git a/usr/src/pkg/manifests/system-network-nis.mf b/usr/src/pkg/manifests/system-network-nis.mf index 17f4bc3df1..6841612ec1 100644 --- a/usr/src/pkg/manifests/system-network-nis.mf +++ b/usr/src/pkg/manifests/system-network-nis.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/nis@$(PKGVERS) @@ -31,8 +30,13 @@ set name=pkg.summary value="Network Information System" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/nis group=sys +dir path=lib/svc/manifest/network/rpc group=sys dir path=usr group=sys dir path=usr/bin dir path=usr/lib @@ -43,16 +47,12 @@ dir path=usr/lib/netsvc/yp dir path=usr/sbin dir path=var group=sys dir path=var/ldap group=sys -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/nis group=sys -dir path=lib/svc/manifest/network/rpc group=sys dir path=var/yp dir path=var/yp/binding file path=etc/nsswitch.nis group=sys file path=etc/publickey original_name=SUNWnis:etc/publickey preserve=true +file path=lib/svc/manifest/network/nis/client.xml group=sys mode=0444 +file path=lib/svc/manifest/network/rpc/rex.xml group=sys mode=0444 file path=usr/bin/chkey group=sys mode=4555 file path=usr/bin/ldaplist mode=0555 file path=usr/bin/ypcat group=other mode=0555 @@ -76,11 +76,10 @@ file path=usr/sbin/ypalias mode=0555 file path=usr/sbin/ypinit mode=0555 file path=usr/sbin/yppoll mode=0555 file path=usr/sbin/ypset mode=0555 -file path=lib/svc/manifest/network/nis/client.xml group=sys mode=0444 -file path=lib/svc/manifest/network/rpc/rex.xml group=sys mode=0444 file path=var/yp/aliases mode=0555 original_name=SUNWnis:var/yp/aliases \ preserve=true -file path=var/yp/nicknames original_name=SUNWnis:var/yp/nicknames preserve=true +file path=var/yp/nicknames original_name=SUNWnis:var/yp/nicknames \ + preserve=true legacy pkg=SUNWnisr arch=$(ARCH) category=system \ desc="configuration files and directories for the Network Information System (NIS)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf index 1eb20acdbb..5af0ee6fca 100644 --- a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf +++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/ppp/pppdump@$(PKGVERS) set name=pkg.description value="Optional GNU utilities for use with PPP" set name=pkg.summary value="GNU utilities for PPP" -set name=info.classification value=org.opensolaris.category.2008:Development/GNU +set name=info.classification \ + value=org.opensolaris.category.2008:Development/GNU set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-network-ppp-tunnel.mf b/usr/src/pkg/manifests/system-network-ppp-tunnel.mf index 5e4f0f0060..bf0358c3e6 100644 --- a/usr/src/pkg/manifests/system-network-ppp-tunnel.mf +++ b/usr/src/pkg/manifests/system-network-ppp-tunnel.mf @@ -20,16 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/ppp/tunnel@$(PKGVERS) -set name=pkg.description value="Extensions implementing PPP tunneling protocols" +set name=pkg.description \ + value="Extensions implementing PPP tunneling protocols" set name=pkg.summary value="Solaris PPP Tunneling" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet diff --git a/usr/src/pkg/manifests/system-network-ppp.mf b/usr/src/pkg/manifests/system-network-ppp.mf index 5b5718c5c8..fe7fec0eb1 100644 --- a/usr/src/pkg/manifests/system-network-ppp.mf +++ b/usr/src/pkg/manifests/system-network-ppp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/ppp@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Solaris PPP Device Drivers" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/init.d group=sys dir path=etc/ppp group=sys diff --git a/usr/src/pkg/manifests/system-network-routing-vrrp.mf b/usr/src/pkg/manifests/system-network-routing-vrrp.mf index 2080b17800..10db36941a 100644 --- a/usr/src/pkg/manifests/system-network-routing-vrrp.mf +++ b/usr/src/pkg/manifests/system-network-routing-vrrp.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/routing/vrrp@$(PKGVERS) @@ -30,26 +29,25 @@ set name=pkg.summary value="Solaris VRRP protocol" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/inet group=sys dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/inet dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys file path=etc/inet/vrrp.conf group=sys +file path=lib/svc/manifest/network/vrrp.xml group=sys mode=0444 file path=lib/svc/method/svc-vrrp mode=0555 file path=usr/lib/$(ARCH64)/libvrrpadm.so.1 file path=usr/lib/inet/vrrpd mode=0555 file path=usr/lib/libvrrpadm.so.1 file path=usr/sbin/vrrpadm mode=0555 -file path=lib/svc/manifest/network/vrrp.xml group=sys mode=0444 legacy pkg=SUNWvrrpr arch=$(ARCH) category=system \ desc="Solaris VRRP Administration" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-routing.mf b/usr/src/pkg/manifests/system-network-routing.mf index 4b7c62f562..acd82070b1 100644 --- a/usr/src/pkg/manifests/system-network-routing.mf +++ b/usr/src/pkg/manifests/system-network-routing.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/routing@$(PKGVERS) @@ -29,17 +28,20 @@ set name=pkg.description value="Network Routing daemons/commands" set name=pkg.summary value="Network Routing daemons/commands" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/routing group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib dir path=usr/lib/inet dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/routing group=sys +file path=lib/svc/manifest/network/routing/ndp.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/rdisc.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/ripng.xml group=sys mode=0444 +file path=lib/svc/manifest/network/routing/route.xml group=sys mode=0444 file path=lib/svc/method/svc-ndp mode=0555 file path=lib/svc/method/svc-rdisc mode=0555 file path=lib/svc/method/svc-ripng mode=0555 @@ -49,10 +51,6 @@ file path=usr/lib/inet/in.ripngd mode=0555 file path=usr/sbin/in.rdisc mode=0555 file path=usr/sbin/in.routed mode=0555 file path=usr/sbin/rtquery mode=0555 -file path=lib/svc/manifest/network/routing/ndp.xml group=sys mode=0444 -file path=lib/svc/manifest/network/routing/rdisc.xml group=sys mode=0444 -file path=lib/svc/manifest/network/routing/ripng.xml group=sys mode=0444 -file path=lib/svc/manifest/network/routing/route.xml group=sys mode=0444 legacy pkg=SUNWroute arch=$(ARCH) category=system \ desc="Network Routing daemons/commands (Usr)" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-spdadm.mf b/usr/src/pkg/manifests/system-network-spdadm.mf index cb38a2e468..8ebdb1853a 100644 --- a/usr/src/pkg/manifests/system-network-spdadm.mf +++ b/usr/src/pkg/manifests/system-network-spdadm.mf @@ -20,22 +20,22 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network/spdadm@$(PKGVERS) set name=pkg.description value="Sun InfiniBand Sockets Direct Protocol Admin" -set name=pkg.summary value="Sun InfiniBand pseudo Sockets Direct Protocol Admin" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=pkg.summary \ + value="Sun InfiniBand pseudo Sockets Direct Protocol Admin" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/lib dir path=usr/lib/rcm diff --git a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf index dc82eadcb1..ea1964cf4d 100644 --- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf +++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf @@ -20,47 +20,43 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network/udapl/udapl-tavor@$(PKGVERS) set name=pkg.description value="Sun uDAPL provider for Tavor" set name=pkg.summary value="Sun uDAPL for Tavor (User)" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/init.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/rc2.d group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=kernel/drv/$(ARCH64) group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/init.d group=sys +dir path=etc/rc2.d group=sys +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/share group=sys dir path=usr/share/dat group=sys driver name=daplt perms="* 0644 root sys" -file path=etc/init.d/dodatadm.udaplt group=sys mode=0744 opensolaris.zone=global \ - original_name=SUNWudaplt:etc/init.d/dodatadm.udaplt preserve=true \ - variant.opensolaris.zone=global -file path=kernel/drv/$(ARCH64)/daplt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -$(i386_ONLY)file path=kernel/drv/daplt group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=kernel/drv/daplt.conf group=sys opensolaris.zone=global \ - reboot-needed=false variant.opensolaris.zone=global +file path=etc/init.d/dodatadm.udaplt group=sys mode=0744 \ + original_name=SUNWudaplt:etc/init.d/dodatadm.udaplt preserve=true +file path=kernel/drv/$(ARCH64)/daplt group=sys +$(i386_ONLY)file path=kernel/drv/daplt group=sys +file path=kernel/drv/daplt.conf group=sys file path=usr/lib/$(ARCH64)/udapl_tavor.so.1 file path=usr/lib/udapl_tavor.so.1 file path=usr/share/dat/SUNWudaplt.conf group=sys mode=0644 -hardlink path=etc/rc2.d/S81dodatadm.udaplt opensolaris.zone=global \ - target=../../etc/init.d/dodatadm.udaplt variant.opensolaris.zone=global +hardlink path=etc/rc2.d/S81dodatadm.udaplt \ + target=../../etc/init.d/dodatadm.udaplt legacy pkg=SUNWudapltr arch=$(ARCH) category=system \ desc="Sun uDAPL provider for Tavor driver and registration script" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-network-udapl.mf b/usr/src/pkg/manifests/system-network-udapl.mf index fe9fd16a39..39a3a3f559 100644 --- a/usr/src/pkg/manifests/system-network-udapl.mf +++ b/usr/src/pkg/manifests/system-network-udapl.mf @@ -20,27 +20,29 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/network/udapl@$(PKGVERS) set name=pkg.description value="Sun DAT registry library and datadm" set name=pkg.summary value="Sun User Direct Access Programming Library (User)" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/dat group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/dat group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/sbin -file path=etc/dat/dat.conf group=sys opensolaris.zone=global \ - original_name=SUNWudapl:etc/dat/dat.conf preserve=true \ - variant.opensolaris.zone=global +file path=etc/dat/dat.conf group=sys original_name=SUNWudapl:etc/dat/dat.conf \ + preserve=true file path=usr/lib/$(ARCH64)/libdat.so.1 file path=usr/lib/$(ARCH64)/llib-ldat.ln file path=usr/lib/libdat.so.1 diff --git a/usr/src/pkg/manifests/system-network-wificonfig.mf b/usr/src/pkg/manifests/system-network-wificonfig.mf index 8916adf63b..de21ca4886 100644 --- a/usr/src/pkg/manifests/system-network-wificonfig.mf +++ b/usr/src/pkg/manifests/system-network-wificonfig.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/network/wificonfig@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="wifi config tool" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=sbin group=sys dir path=usr group=sys dir path=usr/sbin diff --git a/usr/src/pkg/manifests/system-network.mf b/usr/src/pkg/manifests/system-network.mf index cdabc70544..c43a41fc96 100644 --- a/usr/src/pkg/manifests/system-network.mf +++ b/usr/src/pkg/manifests/system-network.mf @@ -29,7 +29,6 @@ set name=pkg.description \ set name=pkg.summary value="Core Solaris Network Infrastructure" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/default group=sys dir path=etc/dladm group=netadm owner=dladm @@ -48,8 +47,8 @@ file path=etc/default/dhcpagent group=sys \ original_name=SUNWcnetr:etc/default/dhcpagent preserve=true file path=etc/default/inetinit group=sys \ original_name=SUNWcnetr:etc/default/inetinit preserve=true -file path=etc/default/ipsec group=sys original_name=SUNWcnetr:etc/default/ipsec \ - preserve=true +file path=etc/default/ipsec group=sys \ + original_name=SUNWcnetr:etc/default/ipsec preserve=true file path=etc/default/mpathd group=sys \ original_name=SUNWcnetr:etc/default/mpathd preserve=true file path=etc/dladm/datalink.conf group=netadm \ @@ -76,13 +75,14 @@ file path=etc/nwam/loc/NoNet/ipf.conf.dfl group=netadm owner=netadm \ file path=etc/nwam/loc/NoNet/ipf6.conf.dfl group=netadm owner=netadm \ preserve=true file path=etc/nwam/loc/create_loc_auto group=netadm owner=netadm preserve=true -file path=etc/nwam/loc/create_loc_nonet group=netadm owner=netadm preserve=true +file path=etc/nwam/loc/create_loc_nonet group=netadm owner=netadm \ + preserve=true file path=sbin/dladm mode=0555 file path=sbin/dlstat mode=0555 file path=sbin/flowadm mode=0555 file path=sbin/flowstat mode=0555 -group groupname=netadm gid=65 file path=sbin/ipadm mode=0555 +group groupname=netadm gid=65 legacy pkg=SUNWcnetr arch=$(ARCH) category=system \ desc="core software for network infrastructure configuration" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-remote-shared-memory.mf b/usr/src/pkg/manifests/system-remote-shared-memory.mf index f6d3b523db..db17605bcd 100644 --- a/usr/src/pkg/manifests/system-remote-shared-memory.mf +++ b/usr/src/pkg/manifests/system-remote-shared-memory.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/remote-shared-memory@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="Remote Shared Memory API Library, Driver" set name=pkg.summary value="Remote Shared Memory" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/kernel group=sys dir path=usr/kernel/drv group=sys diff --git a/usr/src/pkg/manifests/system-scheduler-fss.mf b/usr/src/pkg/manifests/system-scheduler-fss.mf index cd2193e682..6a2ed024f6 100644 --- a/usr/src/pkg/manifests/system-scheduler-fss.mf +++ b/usr/src/pkg/manifests/system-scheduler-fss.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/scheduler/fss@$(PKGVERS) @@ -29,7 +28,6 @@ set name=pkg.description value="core software for the fair share scheduler" set name=pkg.summary value="Fair Share Scheduler" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/kernel group=sys dir path=usr/kernel/sched group=sys diff --git a/usr/src/pkg/manifests/system-security-kerberos-5.mf b/usr/src/pkg/manifests/system-security-kerberos-5.mf index 40442b81ff..aa6b0ba1d1 100644 --- a/usr/src/pkg/manifests/system-security-kerberos-5.mf +++ b/usr/src/pkg/manifests/system-security-kerberos-5.mf @@ -26,12 +26,17 @@ set name=pkg.fmri value=pkg:/system/security/kerberos-5@$(PKGVERS) set name=pkg.description value="Kerberos V5 Master KDC (user)" set name=pkg.summary value="Kerberos V5 Master KDC (user)" -set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.classification \ + value=org.opensolaris.category.2008:System/Security set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/inet group=sys dir path=etc/krb5 group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/network/security group=sys dir path=usr group=sys dir path=usr/lib dir path=usr/lib/krb5 @@ -43,17 +48,13 @@ dir path=usr/share/lib group=sys dir path=usr/share/lib/ldif group=sys dir path=var group=sys dir path=var/krb5 group=sys -dir path=lib -dir path=lib/svc -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/network group=sys -dir path=lib/svc/manifest/network/security group=sys -file path=etc/krb5/kadm5.acl group=sys original_name=SUNWkdc:etc/krb5/kadm5.acl \ - preserve=true +file path=etc/krb5/kadm5.acl group=sys \ + original_name=SUNWkdc:etc/krb5/kadm5.acl preserve=true file path=etc/krb5/kdc.conf group=sys original_name=SUNWkdc:etc/krb5/kdc.conf \ preserve=true file path=etc/krb5/kpropd.acl group=sys \ original_name=SUNWkdc:etc/krb5/kpropd.acl preserve=true +file path=lib/svc/manifest/network/security/krb5_prop.xml group=sys mode=0444 file path=usr/lib/krb5/HelpIndex.html mode=0444 file path=usr/lib/krb5/ListResourceBundle/GuiResource.java mode=0444 file path=usr/lib/krb5/ListResourceBundle/HelpData.java mode=0444 @@ -91,7 +92,6 @@ file path=usr/sbin/kdb5_util mode=0555 file path=usr/sbin/kdcmgr mode=0555 file path=usr/sbin/kproplog mode=0555 file path=usr/share/lib/ldif/kerberos.ldif -file path=lib/svc/manifest/network/security/krb5_prop.xml group=sys mode=0444 legacy pkg=SUNWkdcr arch=$(ARCH) category=system desc="Kerberos V5 KDC (root)" \ hotline="Please contact your local service provider" \ name="Kerberos V5 KDC (root)" vendor="Sun Microsystems, Inc." \ diff --git a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf index 8b2ca5303e..b8891038aa 100644 --- a/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf +++ b/usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf @@ -20,41 +20,34 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ value=pkg:/system/storage/fibre-channel/port-utility@$(PKGVERS) set name=pkg.description value="Utility for Fibre Channel Host Bus Adapters" set name=pkg.summary value="Fibre Channel HBA Port utility" -set name=info.classification value=org.opensolaris.category.2008:System/Hardware +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/sbin -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/npivconfig mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/network/npiv_config.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-fcoei mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/system/fcoe_initiator.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-fcoet mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/system/fcoe_target.xml group=sys mode=0444 \ variant.opensolaris.zone=global +file path=lib/svc/method/npivconfig mode=0555 variant.opensolaris.zone=global +file path=lib/svc/method/svc-fcoei mode=0555 variant.opensolaris.zone=global +file path=lib/svc/method/svc-fcoet mode=0555 variant.opensolaris.zone=global file path=usr/sbin/fcinfo mode=0555 -file path=lib/svc/manifest/network/npiv_config.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/fcoe_initiator.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/fcoe_target.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global hardlink path=usr/sbin/fcadm target=../../usr/sbin/fcinfo legacy pkg=SUNWfcprt arch=$(ARCH) category=system \ desc="Utility for Fibre Channel Host Bus Adapters" \ diff --git a/usr/src/pkg/manifests/system-storage-luxadm.mf b/usr/src/pkg/manifests/system-storage-luxadm.mf index f1ca5167cb..38f50070a8 100644 --- a/usr/src/pkg/manifests/system-storage-luxadm.mf +++ b/usr/src/pkg/manifests/system-storage-luxadm.mf @@ -20,18 +20,17 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/storage/luxadm@$(PKGVERS) set name=pkg.description \ value="Sun Enterprise Network Array firmware and utilities" -set name=pkg.summary value="Sun Enterprise Network Array firmware and utilities" +set name=pkg.summary \ + value="Sun Enterprise Network Array firmware and utilities" set name=info.classification \ value="org.opensolaris.category.2008:System/Enterprise Management" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys $(sparc_ONLY)dir path=usr/lib $(sparc_ONLY)dir path=usr/lib/locale diff --git a/usr/src/pkg/manifests/system-storage-mms.mf b/usr/src/pkg/manifests/system-storage-mms.mf index ac0ddf8a32..293c75b031 100644 --- a/usr/src/pkg/manifests/system-storage-mms.mf +++ b/usr/src/pkg/manifests/system-storage-mms.mf @@ -24,4 +24,3 @@ set name=pkg.fmri value=pkg:/system/storage/mms@0.5.11,5.11-0.139 set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/system-storage-parted.mf b/usr/src/pkg/manifests/system-storage-parted.mf index 689e8aaf83..b817fec66e 100644 --- a/usr/src/pkg/manifests/system-storage-parted.mf +++ b/usr/src/pkg/manifests/system-storage-parted.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -32,7 +31,6 @@ set name=pkg.summary value="GNU Parted - Partition Editor" set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/parted diff --git a/usr/src/pkg/manifests/system-storage-sasinfo.mf b/usr/src/pkg/manifests/system-storage-sasinfo.mf index 8a3a623a1c..4dd94e6e31 100644 --- a/usr/src/pkg/manifests/system-storage-sasinfo.mf +++ b/usr/src/pkg/manifests/system-storage-sasinfo.mf @@ -20,10 +20,15 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/storage/sasinfo@$(PKGVERS) set name=pkg.description \ value="T11 Storage Management HBA API Libraries and CLI" @@ -31,16 +36,14 @@ set name=pkg.summary value="SM-HBA Libraries and CLI" set name=info.classification \ value=org.opensolaris.category.2008:System/Libraries set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys dir path=usr group=sys dir path=usr/include dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/sbin -file path=etc/smhba.conf group=sys opensolaris.zone=global \ - original_name=SUNWsmhba:etc/smhba.conf preserve=true \ - variant.opensolaris.zone=global +file path=etc/smhba.conf group=sys original_name=SUNWsmhba:etc/smhba.conf \ + preserve=true file path=usr/include/smhbaapi.h file path=usr/lib/$(ARCH64)/libSMHBAAPI.so.1 file path=usr/lib/$(ARCH64)/libsun_sas.so.1 diff --git a/usr/src/pkg/manifests/system-tests-svr4.mf b/usr/src/pkg/manifests/system-tests-svr4.mf index 5d13b4624f..65446298c6 100644 --- a/usr/src/pkg/manifests/system-tests-svr4.mf +++ b/usr/src/pkg/manifests/system-tests-svr4.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/tests/svr4@$(PKGVERS) @@ -31,7 +30,6 @@ set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=org.opensolaris.redist value=internal set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/include/sys @@ -71,7 +69,7 @@ $(i386_ONLY)file path=usr/kernel/strmod/lmodt group=sys mode=0755 legacy pkg=SUNWsvvs arch=$(ARCH) category=system \ desc="System V Verification Suite Drivers" \ hotline="Please contact your local service provider" \ - name="System V Verification Suite Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="System V Verification Suite Drivers" \ + vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-tnf.mf b/usr/src/pkg/manifests/system-tnf.mf index 44d7848faf..236607c59e 100644 --- a/usr/src/pkg/manifests/system-tnf.mf +++ b/usr/src/pkg/manifests/system-tnf.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/tnf@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="TNF Core Components" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/bin/$(ARCH32) diff --git a/usr/src/pkg/manifests/system-trusted-global-zone.mf b/usr/src/pkg/manifests/system-trusted-global-zone.mf index 35e47381c3..707a255a8d 100644 --- a/usr/src/pkg/manifests/system-trusted-global-zone.mf +++ b/usr/src/pkg/manifests/system-trusted-global-zone.mf @@ -20,90 +20,65 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +# +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. +# +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/trusted/global-zone@$(PKGVERS) set name=pkg.description \ value="Solaris Trusted Extensions, globalzone-only files" set name=pkg.summary value="Trusted Extensions global" -set name=info.classification value=org.opensolaris.category.2008:System/Trusted +set name=info.classification \ + value=org.opensolaris.category.2008:System/Trusted set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/security group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/security/audio group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/security/lib group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/security/tsol group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/zones group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/network group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=var/tsol group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=var/tsol/doors group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=etc/security/lib/disk_clean group=sys mode=0555 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/lib/wdwmsg group=sys mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=etc/security/lib/wdwwrapper group=sys mode=0555 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/tsol/devalloc_defaults group=sys opensolaris.zone=global \ - original_name=SUNWtsg:etc/security/tsol/devalloc_defaults preserve=true \ - variant.opensolaris.zone=global +dir path=etc group=sys +dir path=etc/security group=sys +dir path=etc/security/audio group=sys +dir path=etc/security/lib group=sys +dir path=etc/security/tsol group=sys +dir path=etc/zones group=sys +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/network group=sys +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/method +dir path=var group=sys +dir path=var/tsol group=sys +dir path=var/tsol/doors group=sys +file path=etc/security/lib/disk_clean group=sys mode=0555 +file path=etc/security/lib/wdwmsg group=sys mode=0555 +file path=etc/security/lib/wdwwrapper group=sys mode=0555 +file path=etc/security/tsol/devalloc_defaults group=sys \ + original_name=SUNWtsg:etc/security/tsol/devalloc_defaults preserve=true file path=etc/security/tsol/label_encodings group=sys mode=0400 \ - opensolaris.zone=global \ - original_name=SUNWtsg:etc/security/tsol/label_encodings preserve=renamenew \ - variant.opensolaris.zone=global -file path=etc/security/tsol/label_encodings.example group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/tsol/label_encodings.gfi.multi group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/tsol/label_encodings.gfi.single group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/tsol/label_encodings.multi group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/tsol/label_encodings.single group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=etc/security/tsol/relabel group=sys mode=0755 opensolaris.zone=global \ - original_name=SUNWtsg:etc/security/tsol/relabel preserve=renamenew \ - variant.opensolaris.zone=global -file path=etc/security/tsol/tnrhdb group=sys opensolaris.zone=global \ - original_name=SUNWtsg:etc/security/tsol/tnrhdb preserve=renamenew \ - variant.opensolaris.zone=global -file path=etc/security/tsol/tnrhtp group=sys opensolaris.zone=global \ - original_name=SUNWtsg:etc/security/tsol/tnrhtp preserve=renamenew \ - variant.opensolaris.zone=global -file path=etc/security/tsol/tnzonecfg group=sys opensolaris.zone=global \ - original_name=SUNWtsg:etc/security/tsol/tnzonecfg preserve=renamenew \ - variant.opensolaris.zone=global + original_name=SUNWtsg:etc/security/tsol/label_encodings \ + preserve=renamenew +file path=etc/security/tsol/label_encodings.example group=sys mode=0444 +file path=etc/security/tsol/label_encodings.gfi.multi group=sys mode=0444 +file path=etc/security/tsol/label_encodings.gfi.single group=sys mode=0444 +file path=etc/security/tsol/label_encodings.multi group=sys mode=0444 +file path=etc/security/tsol/label_encodings.single group=sys mode=0444 +file path=etc/security/tsol/relabel group=sys mode=0755 \ + original_name=SUNWtsg:etc/security/tsol/relabel preserve=renamenew +file path=etc/security/tsol/tnrhdb group=sys \ + original_name=SUNWtsg:etc/security/tsol/tnrhdb preserve=renamenew +file path=etc/security/tsol/tnrhtp group=sys \ + original_name=SUNWtsg:etc/security/tsol/tnrhtp preserve=renamenew +file path=etc/security/tsol/tnzonecfg group=sys \ + original_name=SUNWtsg:etc/security/tsol/tnzonecfg preserve=renamenew file path=etc/zones/SUNWtsoldef.xml mode=0444 -file path=lib/svc/method/svc-labeld mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-tnctl mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/method/svc-tnd mode=0555 opensolaris.zone=global \ - variant.opensolaris.zone=global -file path=lib/svc/manifest/network/tnctl.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/network/tnd.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/labeld.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global +file path=lib/svc/manifest/network/tnctl.xml group=sys mode=0444 +file path=lib/svc/manifest/network/tnd.xml group=sys mode=0444 +file path=lib/svc/manifest/system/labeld.xml group=sys mode=0444 +file path=lib/svc/method/svc-labeld mode=0555 +file path=lib/svc/method/svc-tnctl mode=0555 +file path=lib/svc/method/svc-tnd mode=0555 legacy pkg=SUNWtsg arch=$(ARCH) category=system \ desc="Solaris Trusted Extensions, globalzone-only files" \ hotline="Please contact your local service provider" \ @@ -111,9 +86,6 @@ legacy pkg=SUNWtsg arch=$(ARCH) category=system \ version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=etc/security/lib/audio_clean.windowing opensolaris.zone=global \ - target=./audio_clean variant.opensolaris.zone=global -link path=etc/security/lib/disk_clean.windowing opensolaris.zone=global \ - target=./disk_clean variant.opensolaris.zone=global -link path=etc/security/lib/st_clean.windowing opensolaris.zone=global \ - target=./st_clean variant.opensolaris.zone=global +link path=etc/security/lib/audio_clean.windowing target=./audio_clean +link path=etc/security/lib/disk_clean.windowing target=./disk_clean +link path=etc/security/lib/st_clean.windowing target=./st_clean diff --git a/usr/src/pkg/manifests/system-trusted.mf b/usr/src/pkg/manifests/system-trusted.mf index 09969cad15..f3bf08a940 100644 --- a/usr/src/pkg/manifests/system-trusted.mf +++ b/usr/src/pkg/manifests/system-trusted.mf @@ -20,18 +20,19 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/trusted@$(PKGVERS) set name=pkg.description value="Solaris Trusted Extensions" set name=pkg.summary value="Trusted Extensions" -set name=info.classification value=org.opensolaris.category.2008:System/Trusted +set name=info.classification \ + value=org.opensolaris.category.2008:System/Trusted set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=sbin group=sys dir path=usr group=sys @@ -56,8 +57,7 @@ dir path=usr/lib/lp/model group=lp dir path=usr/lib/lp/postscript group=lp dir path=usr/lib/zones dir path=usr/sbin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys +file path=lib/svc/manifest/system/tsol-zones.xml group=sys mode=0444 file path=lib/svc/method/svc-tsol-zones mode=0555 file path=sbin/tnctl group=sys mode=0555 file path=usr/bin/getlabel mode=0555 @@ -119,7 +119,6 @@ file path=usr/sbin/tnchkdb group=sys mode=0555 file path=usr/sbin/tnd group=sys mode=0555 file path=usr/sbin/tninfo group=sys mode=0555 file path=usr/sbin/txzonemgr group=sys mode=0555 -file path=lib/svc/manifest/system/tsol-zones.xml group=sys mode=0444 hardlink path=usr/sbin/remove_allocatable target=add_allocatable legacy pkg=SUNWtsr arch=$(ARCH) category=system \ desc="Solaris Trusted Extensions, (Root)" \ diff --git a/usr/src/pkg/manifests/system-xopen-xcu4.mf b/usr/src/pkg/manifests/system-xopen-xcu4.mf index 08d9b209c9..161afe8909 100644 --- a/usr/src/pkg/manifests/system-xopen-xcu4.mf +++ b/usr/src/pkg/manifests/system-xopen-xcu4.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/xopen/xcu4@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="XCU4 Utilities" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/xpg4 dir path=usr/xpg4/bin @@ -101,8 +99,9 @@ hardlink path=usr/xpg4/bin/view target=../../../usr/xpg4/bin/edit hardlink path=usr/xpg4/bin/wait target=../../../usr/xpg4/bin/alias legacy pkg=SUNWxcu4 arch=$(ARCH) category=system \ desc="utilities providing conformance with XCU4 specifications" \ - hotline="Please contact your local service provider" name="XCU4 Utilities" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="XCU4 Utilities" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-xopen-xcu6.mf b/usr/src/pkg/manifests/system-xopen-xcu6.mf index 9b3e44d5fe..ad4eb51ed7 100644 --- a/usr/src/pkg/manifests/system-xopen-xcu6.mf +++ b/usr/src/pkg/manifests/system-xopen-xcu6.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/xopen/xcu6@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="XCU6 Utilities" set name=info.classification \ value="org.opensolaris.category.2008:Applications/System Utilities" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/xpg6 dir path=usr/xpg6/bin @@ -50,8 +48,9 @@ hardlink path=usr/xpg6/bin/vi target=../../../usr/xpg6/bin/edit hardlink path=usr/xpg6/bin/view target=../../../usr/xpg6/bin/edit legacy pkg=SUNWxcu6 arch=$(ARCH) category=system \ desc="utilities providing conformance with XCU6 specifications" \ - hotline="Please contact your local service provider" name="XCU6 Utilities" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Please contact your local service provider" \ + name="XCU6 Utilities" vendor="Sun Microsystems, Inc." \ + version=11.11,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/xpg6/bin/stty target=../../bin/stty diff --git a/usr/src/pkg/manifests/system-xvm-ipagent.mf b/usr/src/pkg/manifests/system-xvm-ipagent.mf index 72a1c6e65e..111cbc014a 100644 --- a/usr/src/pkg/manifests/system-xvm-ipagent.mf +++ b/usr/src/pkg/manifests/system-xvm-ipagent.mf @@ -20,35 +20,33 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. +# The default for payload-bearing actions in this package is to appear in the +# global zone only. See the include file for greater detail, as well as +# information about overriding the defaults. # -<include hollow_zone_pkg> +<include global_zone_only_component> set name=pkg.fmri value=pkg:/system/xvm/ipagent@$(PKGVERS) set name=pkg.description value="xVM PV IP address agent" set name=pkg.summary value="xVM PV IP address agent" set name=info.classification \ value=org.opensolaris.category.2008:System/Virtualization set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal dir path=lib dir path=lib/svc +dir path=lib/svc/manifest group=sys +dir path=lib/svc/manifest/system group=sys dir path=lib/svc/method dir path=usr group=sys dir path=usr/lib dir path=usr/lib/xen dir path=usr/lib/xen/bin -dir path=lib/svc/manifest group=sys -dir path=lib/svc/manifest/system group=sys +file path=lib/svc/manifest/system/ipagent.xml group=sys mode=0444 file path=lib/svc/method/svc-ipagent mode=0555 file path=usr/lib/xen/bin/ipagent mode=0555 -file path=lib/svc/manifest/system/ipagent.xml group=sys mode=0444 legacy pkg=SUNWxvmipar arch=$(ARCH) category=system \ desc="xVM PV IP address agent" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/system-zones-brand-lx.mf b/usr/src/pkg/manifests/system-zones-brand-lx.mf index 9179ed802f..ca3a8cc541 100644 --- a/usr/src/pkg/manifests/system-zones-brand-lx.mf +++ b/usr/src/pkg/manifests/system-zones-brand-lx.mf @@ -23,13 +23,6 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# -# This package will install successfully into any zone, global or -# non-global. The files, directories, links, and hardlinks, however, -# will only be installed into the global zone. -# set name=pkg.fmri value=pkg:/system/zones/brand/lx@0.5.11,5.11-0.143 set name=pkg.obsolete value=true -set name=pkg.description value="Support for the 'lx' Brand" set name=variant.arch value=i386 -set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/manifests/system-zones-brand-s10.mf b/usr/src/pkg/manifests/system-zones-brand-s10.mf index dc4a401e26..0dfbe1167a 100644 --- a/usr/src/pkg/manifests/system-zones-brand-s10.mf +++ b/usr/src/pkg/manifests/system-zones-brand-s10.mf @@ -29,7 +29,6 @@ set name=pkg.summary value="Solaris 10 Containers: solaris10 brand support" set name=info.classification \ value=org.opensolaris.category.2008:System/Virtualization set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/brand group=sys dir path=etc/brand/solaris10 group=sys @@ -58,10 +57,10 @@ file path=etc/brand/solaris10/smf_disable.conf group=sys \ original_name=SUNWs10brand:etc/brand/solaris10/smf_disable.conf \ preserve=true file path=etc/zones/SUNWsolaris10.xml mode=0444 -$(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/s10_brand group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/s10_brand group=sys \ - mode=0755 reboot-needed=true +$(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/s10_brand \ + group=sys mode=0755 +$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/s10_brand \ + group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/s10_brand group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/brand/s10_brand group=sys mode=0755 file path=usr/lib/$(ARCH64)/s10_brand.so.1 diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.mf b/usr/src/pkg/manifests/system-zones-brand-sn1.mf index 8b4284fee3..f44bb085e5 100644 --- a/usr/src/pkg/manifests/system-zones-brand-sn1.mf +++ b/usr/src/pkg/manifests/system-zones-brand-sn1.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/zones/brand/sn1@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Fake Solaris N-1 Brand" set name=info.classification \ value=org.opensolaris.category.2008:System/Virtualization set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=etc group=sys dir path=etc/zones group=sys $(sparc_ONLY)dir path=platform group=sys @@ -52,10 +50,10 @@ dir path=usr/lib/brand dir path=usr/lib/brand/sn1 group=sys dir path=usr/lib/brand/sn1/$(ARCH64) file path=etc/zones/SUNWsn1.xml mode=0444 -$(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/sn1_brand group=sys \ - mode=0755 reboot-needed=true -$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/sn1_brand group=sys \ - mode=0755 reboot-needed=true +$(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/sn1_brand \ + group=sys mode=0755 +$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/sn1_brand \ + group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/sn1_brand group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/brand/sn1_brand group=sys mode=0755 file path=usr/lib/$(ARCH64)/sn1_brand.so.1 diff --git a/usr/src/pkg/manifests/system-zones-internal.mf b/usr/src/pkg/manifests/system-zones-internal.mf index 15a0309532..b32670ca79 100644 --- a/usr/src/pkg/manifests/system-zones-internal.mf +++ b/usr/src/pkg/manifests/system-zones-internal.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/zones/internal@$(PKGVERS) @@ -30,7 +29,6 @@ set name=pkg.summary value="Solaris Zones Internal Files" set name=info.classification \ value=org.opensolaris.category.2008:Development/System set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/include dir path=usr/lib diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.mf index 1beb49c533..a641666aee 100644 --- a/usr/src/pkg/manifests/system-zones.mf +++ b/usr/src/pkg/manifests/system-zones.mf @@ -20,24 +20,23 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/system/zones@$(PKGVERS) -set name=pkg.description value="Solaris Zones Configuration and Administration" +set name=pkg.description \ + value="Solaris Zones Configuration and Administration" set name=pkg.summary value="Solaris Zones" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal -dir path=etc group=sys opensolaris.zone=global variant.opensolaris.zone=global -dir path=etc/brand group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=etc/zones group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc opensolaris.zone=global variant.opensolaris.zone=global -dir path=lib/svc/method opensolaris.zone=global variant.opensolaris.zone=global +dir path=etc group=sys variant.opensolaris.zone=global +dir path=etc/brand group=sys variant.opensolaris.zone=global +dir path=etc/zones group=sys variant.opensolaris.zone=global +dir path=lib variant.opensolaris.zone=global +dir path=lib/svc variant.opensolaris.zone=global +dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global +dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global +dir path=lib/svc/method variant.opensolaris.zone=global dir path=usr group=sys dir path=usr/bin dir path=usr/kernel group=sys @@ -54,20 +53,18 @@ dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/xml group=sys dir path=usr/share/lib/xml/dtd group=sys -dir path=lib/svc/manifest group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global -dir path=lib/svc/manifest/system group=sys opensolaris.zone=global \ - variant.opensolaris.zone=global driver name=zcons file path=etc/zones/SUNWblank.xml mode=0444 file path=etc/zones/SUNWdefault.xml mode=0444 -file path=etc/zones/index group=sys opensolaris.zone=global \ - original_name=SUNWzone:etc/zones/index preserve=true \ +file path=etc/zones/index group=sys original_name=SUNWzone:etc/zones/index \ + preserve=true variant.opensolaris.zone=global +file path=lib/svc/manifest/system/resource-mgmt.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-resource-mgmt mode=0555 opensolaris.zone=global \ +file path=lib/svc/manifest/system/zones.xml group=sys mode=0444 \ variant.opensolaris.zone=global -file path=lib/svc/method/svc-zones mode=0555 opensolaris.zone=global \ +file path=lib/svc/method/svc-resource-mgmt mode=0555 \ variant.opensolaris.zone=global +file path=lib/svc/method/svc-zones mode=0555 variant.opensolaris.zone=global file path=usr/kernel/drv/$(ARCH64)/zcons group=sys $(i386_ONLY)file path=usr/kernel/drv/zcons group=sys file path=usr/lib/$(ARCH64)/libbrand.so.1 @@ -86,10 +83,6 @@ file path=usr/sbin/zonecfg mode=0555 file path=usr/share/lib/xml/dtd/brand.dtd.1 mode=0644 file path=usr/share/lib/xml/dtd/zone_platform.dtd.1 mode=0644 file path=usr/share/lib/xml/dtd/zonecfg.dtd.1 -file path=lib/svc/manifest/system/resource-mgmt.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global -file path=lib/svc/manifest/system/zones.xml group=sys mode=0444 \ - opensolaris.zone=global variant.opensolaris.zone=global legacy pkg=SUNWzoner arch=$(ARCH) category=system \ desc="Solaris Zones Configuration Files" \ hotline="Please contact your local service provider" \ diff --git a/usr/src/pkg/manifests/text-doctools.mf b/usr/src/pkg/manifests/text-doctools.mf index 99f8a99381..ca854af778 100644 --- a/usr/src/pkg/manifests/text-doctools.mf +++ b/usr/src/pkg/manifests/text-doctools.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/text/doctools@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="Documentation Tools" set name=info.classification \ value="org.opensolaris.category.2008:System/Text Tools" set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/manifests/text-locale.mf b/usr/src/pkg/manifests/text-locale.mf index d31b232bb9..87daddb7ba 100644 --- a/usr/src/pkg/manifests/text-locale.mf +++ b/usr/src/pkg/manifests/text-locale.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/text/locale@$(PKGVERS) @@ -31,7 +30,6 @@ set name=pkg.summary value="System Localization" set name=info.classification \ value=org.opensolaris.category.2008:System/Localizations set name=variant.arch value=$(ARCH) -set name=variant.opensolaris.zone value=global value=nonglobal dir path=usr group=sys dir path=usr/bin dir path=usr/lib diff --git a/usr/src/pkg/transforms/hollow_zone_pkg b/usr/src/pkg/transforms/common_actions index 0e9939fe23..e22e175449 100644 --- a/usr/src/pkg/transforms/hollow_zone_pkg +++ b/usr/src/pkg/transforms/common_actions @@ -20,12 +20,20 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# A hollow package is one that installs into all zones, but only -# delivers content to the global zone. +# These actions represent settings which should appear in every package. # -<transform dir driver file link hardlink -> set variant.opensolaris.zone global> + +# +# Name the consolidation this package came from. +# +set name=org.opensolaris.consolidation value=osnet + +# +# Indicate that the package was published in a zones aware +# fashion. +# +set name=variant.opensolaris.zone value=global value=nonglobal diff --git a/usr/src/pkg/transforms/defaults b/usr/src/pkg/transforms/defaults index 65c455dbc7..791c548cf0 100644 --- a/usr/src/pkg/transforms/defaults +++ b/usr/src/pkg/transforms/defaults @@ -20,16 +20,10 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # # -# This isn't really a transform, but it's a valid default. -# -set name=org.opensolaris.consolidation value=osnet - -# # For kernel/drv, set .conf files to mode 0644. Assume all other # files there are drivers, and give them mode 0755 and reboot-needed. # @@ -42,6 +36,18 @@ set name=org.opensolaris.consolidation value=osnet <transform file path=.*kernel/drv/.+ -> default mode 0755> <transform file path=.*kernel/.+(?<!\.conf)$ -> default reboot-needed true> + +# +# Non-global zones should not have content in kernel, usr/kernel (and +# other kernel dirs) or in boot/. +# +<transform file dir link hardlink path=.*kernel/.* -> set variant.opensolaris.zone global> +<transform dir path=kernel$ -> set variant.opensolaris.zone global> +<transform dir path=.*/kernel$ -> set variant.opensolaris.zone global> + +<transform file dir link hardlink path=boot/.* -> set variant.opensolaris.zone global> +<transform dir path=boot$ -> set variant.opensolaris.zone global> + # # shared objects should generally have mode 0755 # diff --git a/usr/src/pkg/transforms/global_zone_only_component b/usr/src/pkg/transforms/global_zone_only_component new file mode 100644 index 0000000000..e090506830 --- /dev/null +++ b/usr/src/pkg/transforms/global_zone_only_component @@ -0,0 +1,95 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# For packagers: +# +# This ruleset is useful for "system" components-- ones which are expected +# to appear primarily in the global zone, but which may have some small +# pieces (man pages, header files) which may need to appear in all zones. +# +# The current rules specify that all payload-bearing actions (file, +# dir, hardlink, link) should appear *only* in the global zone, with +# the following exceptions: +# +# - man pages appear in all zones +# - header files appear in all zones +# - mdb(1) modules appear in all zones +# +# You may well have other actions which you wish to appear in all zones. +# An example would be an administrative utility for a driver which has +# been virtualized to work within zones. For those actions you wish to +# appear in all zones, add the following attribute to your action. +# +# variant.opensolaris.zone=__NODEFAULT +# +# You DO NOT need to specify __NODEFAULT for man pages, headers, or +# mdb modules, as those are covered by the automatic rules below. +# +# Note: When you specify variant.opensolaris.zone=__NODEFAULT, the +# net effect is that *no* variant.opensolaris.zone attribute will +# appear in the post-processed manifest. +# + +# +# For packaging nerds: +# +# We have a problem to solve here: To make an action appear in all zones, +# it should have *no* variant.opensolaris.zone attribute. So it's a bit +# more complicated to use "default". +# +# Here's what we do: we use "default" to set all payload bearing actions +# which have no variant.opensolaris.zone attribute to be +# variant.opensolaris.zone=global. For those actions which need to appear +# in all zones, the packager must specify +# variant.opensolaris.zone=__NODEFAULT. Additionally we have some rules +# which set __NODEFAULT for a few classes of well known things, like man +# pages and headers. +# +# We then go through and clean up all of the __NODEFAULTed attributes by +# simply deleting them. +# + +# Man pages should appear in all zones. +<transform dir file link hardlink path=.*/man/.* -> default variant.opensolaris.zone __NODEFAULT> +<transform dir path=.*/man$ -> default variant.opensolaris.zone __NODEFAULT> + +# Headers should appear in all zones. +<transform dir file link hardlink path=.*/include/.* -> default variant.opensolaris.zone __NODEFAULT> +<transform dir path=.*/include$ -> default variant.opensolaris.zone __NODEFAULT> + +# MDB modules should appear in all zones, as one might debug a crash dump +# in a zone. +<transform dir file link hardlink path=.*/mdb/.* -> default variant.opensolaris.zone __NODEFAULT> +<transform dir path=.*/mdb$ -> default variant.opensolaris.zone __NODEFAULT> + +# Everything else is global zone only unless the user overrides +# action-by-action with __NODEFAULT. +<transform dir file link hardlink -> default variant.opensolaris.zone global> + +# +# Buff out the __NODEFAULT attributes. +# +<transform dir file link hardlink -> delete variant.opensolaris.zone __NODEFAULT> |