diff options
Diffstat (limited to 'usr/src/pkg')
399 files changed, 2913 insertions, 4881 deletions
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index e336d36745..ee7f7b3769 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -66,20 +66,15 @@ PKGDEBUG= @ # is unable to find the required binaries. # 2. You need the desired tools proto area, which you can get in the # same ways as the normal proto area. If you don't do this, you -# will get packaging failures building SUNWonbld, because pkgsend is +# will get packaging failures building onbld, because pkgsend is # unable to find the tools binaries. -# 3. You need to have built the appropriate third party license -# files in $SRC, which generally means you should override SRC in -# your build environment. If you don't do this, you will get -# packaging failures because pkgsend is unable to find various -# THIRDPARTYLICENSE files. -# 4. The remainder of this Makefile should never refer directly to +# 3. The remainder of this Makefile should never refer directly to # $(MACH). Instead, $(PKGMACH) should be used whenever an # architecture-specific path or token is needed. If this is done # incorrectly, then packaging will fail, and you will see the # value of $(uname -p) instead of the value of $(PKGMACH) in the # commands that fail. -# 5. Each time a rule in this Makefile invokes $(MAKE), it should +# 4. Each time a rule in this Makefile invokes $(MAKE), it should # pass PKGMACH=$(PKGMACH) explicitly on the command line. If # this is done incorrectly, then packaging will fail, and you # will see the value of $(uname -p) instead of the value of @@ -212,7 +207,6 @@ PKGMOG_DEFINES= \ PKGVERS_BUILTON=$(PKGVERS_BUILTON) \ PKGVERS_BRANCH=$(PKGVERS_BRANCH) \ PKGVERS=$(PKGVERS) \ - SRC=$(SRC) \ CLOSED_BUILD=$(CLOSED_BUILD) \ OPEN_BUILD=$(OPEN_ONLY_BUILD) \ USE_INTERNAL_CRYPTO=$(USE_INTERNAL_CRYPTO) \ @@ -378,16 +372,11 @@ PKGLISTS= \ # | pkgdepend # | # processed manifests -# -# Due to limitations in pkgdepend, we cannot simply treat synthetic -# and real manifests identically. But we don't really want to -# maintain a separate chain for synthetic manifests, so for the left -# side of this diagram, we actually do faux dependency generation and -# resolution, so we end up with the expected set of files in $(PDIR), -# per the individual file chain described above: mf, mog, dep, res, -# and pub files for each manifest. # -all: $(PROC_SYNTH_PKGS) proto_list_$(PKGMACH) + +ALL_TARGETS= $(PROC_SYNTH_PKGS) proto_list_$(PKGMACH) + +all: $(ALL_TARGETS) # # This will build the directory to contain the processed manifests @@ -399,16 +388,10 @@ $(PDIR): # # This rule resolves dependencies across all published manifests. -# We should be able to do this with -# -# pkgdepend resolve -m $(PUB_PKGS:%.pub=%.dep) # -# but until 14113 is fixed, the incorporations confuse pkgdepend, so we -# just create the .res file for DEP_SYNTH_PKGS directly. -# -# We also shouldn't have to ignore the error from pkgdepend, but -# until at least 14110 is resolved, pkgdepend will always exit with -# an error. +# We shouldn't have to ignore the error from pkgdepend, but until +# 16012 and its dependencies are resolved, pkgdepend will always exit +# with an error. # $(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS) -$(PKGDEBUG)if [ "$(SUPPRESSPKGDEP)" = "true" ]; then \ @@ -418,8 +401,8 @@ $(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS) done; \ else \ print "Resolving dependencies"; \ - pkgdepend resolve -m $(DEP_PKGS); \ - for p in $(DEP_PKGS:%.dep=%); do \ + pkgdepend resolve -m $(DEP_SYNTH_PKGS) $(DEP_PKGS); \ + for p in $(DEP_SYNTH_PKGS:%.dep=%) $(DEP_PKGS:%.dep=%); do \ if [ "$$(print $$p.metadata.*)" = \ "$$(print $$p.metadata.noincorp.*)" ]; \ then \ @@ -433,20 +416,15 @@ $(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS) fi; \ done; \ fi - $(PKGDEBUG)for p in $(DEP_SYNTH_PKGS:%.dep=%); \ - do \ - $(CP) $$p.dep $$p.res; \ - done $(PKGDEBUG)$(TOUCH) $(@) -install: repository-metadata +install: $(ALL_TARGETS) repository-metadata repository-metadata: publish_pkgs @print "Creating repository metadata" $(PKGDEBUG)for r in $(REPOS); do \ /usr/lib/pkg.depotd -d $(PKGDEST)/repo.$$r \ --add-content --exit-ready; \ - chmod a+r $(PKGDEST)/repo.$$r/cfg_cache; \ done # @@ -460,7 +438,12 @@ repository-metadata: publish_pkgs # publish_pkgs: $(REPOS:%=$(PKGDEST)/repo.%) $(PDIR)/gendeps .WAIT $(PUB_PKGS) -$(PUB_PKGS): FRC +# +# Before publishing, we want to pull the license files from $CODEMGR_WS +# into the proto area. This allows us to NOT pass $SRC (or +# $CODEMGR_WS) as a basedir for publication. +# +$(PUB_PKGS): stage-licenses # # Initialize the empty on-disk repositories @@ -536,8 +519,9 @@ $(REPOS:%=$(PKGDEST)/repo.%): $(PDIR)/%.mog: manifests/%.mf @print "Processing manifest $(<F)" + @pkgfmt -c $< $(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \ - $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars + $(@:%.mog=%.lics) $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars $(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \ $(PKGMOG_DEFINES:%=-D %) -P $(@).vars -O $(@) \ $(<) $(PM_TRANSFORMS) @@ -553,8 +537,9 @@ $(PDIR)/%.mog: manifests/%.mf \( "$$PKGSTAT" = "renamed" \) ]; \ then print $(PKGDEP_INCORP) >> $(@); \ fi; \ + print $$LICS > $(@:%.mog=%.lics); \ else \ - $(TOUCH) $(@); \ + $(TOUCH) $(@) $(@:%.mog=%.lics); \ fi $(PKGDEBUG)$(RM) $(@).vars @@ -580,8 +565,9 @@ $(PDIR)/%.pub: $(PDIR)/%.res if [ -s $(<) ]; then \ print "Publishing $(@F:%.pub=%) to $$r repository"; \ pkgsend -s file://$(PKGDEST)/repo.$$r publish \ - -d $(PKGROOT) -d $(TOOLSROOT) -d $(SRC)/pkg/license_files \ - -d $(SRC) --fmri-in-manifest --no-index --no-catalog $(<) \ + -d $(PKGROOT) -d $(TOOLSROOT) \ + -d license_files -d $(PKGROOT)/licenses \ + --fmri-in-manifest --no-index --no-catalog $(<) \ > /dev/null; \ fi; \ $(TOUCH) $(@); @@ -687,6 +673,30 @@ makesilent: @$(MAKE) -e $(PROC_PKGS) PKGMACH=$(PKGMACH) \ SUPPRESSPKGDEP=$(SUPPRESSPKGDEP) > /dev/null +# +# The .lics files were created during pkgmogrification, and list the +# set of licenses to pull from $SRC for each package. Because +# licenses may be duplicated between packages, we uniquify them as +# well as aggregating them here. +# +license-list: makesilent + $(PKGDEBUG)( for l in `cat $(PROC_PKGS:%.mog=%.lics)`; \ + do print $$l; done ) | sort -u > $@ + +# +# Staging the license and description files in the proto area allows +# us to do proper unreferenced file checking of both license and +# description files without blanket exceptions, and to pull license +# content without reference to $CODEMGR_WS during publication. +# +stage-licenses: license-list FRC + $(PKGDEBUG)$(MAKE) -e -f Makefile.lic \ + PKGDEBUG=$(PKGDEBUG) LICROOT=$(PKGROOT)/licenses \ + `$(NAWK) '{ \ + print "$(PKGROOT)/licenses/" $$0; \ + print "$(PKGROOT)/licenses/" $$0 ".descrip"; \ + }' license-list` > /dev/null; + protocmp: makesilent @validate_pkg -a $(PKGMACH) -v \ $(EXCEPTIONS:%=-e $(CODEMGR_WS)/exception_lists/%) \ diff --git a/usr/src/pkg/Makefile.lic b/usr/src/pkg/Makefile.lic new file mode 100644 index 0000000000..10a46633aa --- /dev/null +++ b/usr/src/pkg/Makefile.lic @@ -0,0 +1,63 @@ +# +# 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. +# + +# +# PKGDEBUG and LICROOT should be defined on the command line or in +# the environment when using this Makefile, as they generally come +# from usr/src/pkg/Makefile. The remaining env vars should already +# be part of a working build environment. +# + +include $(SRC)/Makefile.master + +# +# For license files in the open source tree, always copy them from src +# into the license staging directory in the proto area +# +$(LICROOT)/usr/src/%: $(CODEMGR_WS)/usr/src/% + $(PKGDEBUG)if [ ! -d $(@D) ]; then mkdir -p $(@D); fi + $(PKGDEBUG)$(INS.file) + +# +# For license files in the closed source tree, the desired action +# depends on the type of build. +# +# 1. For a normal build, with closed source present, simply copy the +# file into the license staging directory. +# +# 2. For a Tonic build, copy the file into both open and closed +# license staging directories. +# +# 3. For a build without closed source, rely on closed-bins extraction +# to stage the license file, and do nothing here. +# +$(TONICBUILD)INS= install -O +$(LICROOT)/usr/closed/%: $(CLOSED_BUILD) $(CODEMGR_WS)/usr/closed/% + $(CLOSED_BUILD)$(PKGDEBUG) \ + if [ ! -d $(@D) ]; then \ + mkdir -p $(@D); \ + fi; \ + $(TONICBUILD) $(RM) $(@:$(ROOT)/%=$(CLOSEDROOT)/%) + $(CLOSED_BUILD)$(PKGDEBUG)$(INS.file) diff --git a/usr/src/pkg/license_files/cr_Intel.SUNWfipe b/usr/src/pkg/license_files/cr_Intel.SUNWfipe deleted file mode 100644 index ba4127ccbf..0000000000 --- a/usr/src/pkg/license_files/cr_Intel.SUNWfipe +++ /dev/null @@ -1 +0,0 @@ - * Copyright(c) 2009 Intel Corporation. All rights reserved. diff --git a/usr/src/pkg/license_files/cr_Intel.SUNWintgige b/usr/src/pkg/license_files/cr_Intel.SUNWintgige deleted file mode 100644 index 7b50301039..0000000000 --- a/usr/src/pkg/license_files/cr_Intel.SUNWintgige +++ /dev/null @@ -1 +0,0 @@ - * Copyright(c) 1999 - 2008 Intel Corporation. All rights reserved. diff --git a/usr/src/pkg/license_files/cr_Intel.hotplug b/usr/src/pkg/license_files/cr_Intel.hotplug deleted file mode 100644 index bf0648aabc..0000000000 --- a/usr/src/pkg/license_files/cr_Intel.hotplug +++ /dev/null @@ -1 +0,0 @@ - * Copyright(c) 2009 - 2010 Intel Corporation. All rights reserved. diff --git a/usr/src/pkg/license_files/grubcredits b/usr/src/pkg/license_files/grubcredits deleted file mode 100644 index af7601bfcf..0000000000 --- a/usr/src/pkg/license_files/grubcredits +++ /dev/null @@ -1,62 +0,0 @@ -Solaris VTOC and UFS support added by Sun Microsystems. - -Graphics/splashimage patch originally written by Paulo Cesar Pereira de Andrade -(see http://ruslug.rutgers.edu/~mcgrof/grub-images/). - -GRUB 0.95 diskless patches by Feng Shuo. - -=============================================================================== -VaX#n8 (real name unknown) wrote shared_src/fsys_ext2fs.c. - -Heiko Schroeder rewrote shared_src/stage1.S to be more readable. - -The following authors assigned copyright on their work to the Free -Software Foundation: - -Erich Stefan Boleyn originally designed and implemented GRUB. - -Gordon Matzigkeit adopted GRUB into the GNU Project. He fixed several -bugs, added symbolic link support to shared_src/fsys_ext2fs.c, and -began the implementation of /sbin/grub. He was an official maintainer. - -Yoshinori K. Okuji contributed many bugfixes and new features, such as -working LBA support, /sbin/grub support for configuration files, the -script /sbin/grub-install, the utility /bin/mbchk, the new engine for -builtin commands, disk swapping support, keyboard configuration support, -network support, online help support, command-line history support, -hidden menu support, the new Linux loader, serial terminal support, -single-line editing support, the utility /sbin/grub-md5-crypt, the new -GRUB manual, and several new commands. He is the current official -maintainer. - -Peter Astrand added support for a color menu. - -Pavel Roskin contributed many bugfixes and new features, such as FreeBSD -support for the grub shell, and configure process cleanups. - -Klaus Reichl wrote stage2/fsys_minix.c. - -Per Lundberg added graphics support to the Multiboot Specification. - -Jochen Hoenicke rewrote stage2/fsys_fat.c and wrote -stage2/fsys_reiserfs.c and stage2/md5.c. - -Christoph Plattner added support for Net Boot Image Proposal. - -Frank Mehnert added support for hercules console. - -Kristoffer Branemyr added VSTa filesystem support. - -Serguei Tzukanov added JFS and XFS support. - -Jason Thomas added Linux DAC960 support and support for hiding/unhiding -logical partitions, and did a significant bugfix for the terminal stuff. - -Tilmann Bubeck added support for vt100-incompatible terminals. - -KB Sriram added a better detection of FAT filesystem and fixed a -network device completion. - -Eric Kvaalen fixed a lot of problems in the GRUB manual. - -Leonid Lisovskiy added El Torito support. diff --git a/usr/src/pkg/license_files/lic_AMD b/usr/src/pkg/license_files/lic_AMD deleted file mode 100644 index 39c1881b64..0000000000 --- a/usr/src/pkg/license_files/lic_AMD +++ /dev/null @@ -1,39 +0,0 @@ -Copyright (c) 2002 Advanced Micro Devices, Inc. - -All rights reserved. - -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: - -+ Redistributions of source code must retain the above - copyright notice, this list of conditions and the - following disclaimer. - -+ Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the - following disclaimer in the documentation and/or other - materials provided with the distribution. - -+ Neither the name of Advanced Micro Devices, Inc. nor the - names of its contributors may be used to endorse or - promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, -INC. OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -It is licensee's responsibility to comply with any export -regulations applicable in licensee's jurisdiction. diff --git a/usr/src/pkg/license_files/lic_Emulex b/usr/src/pkg/license_files/lic_Emulex deleted file mode 100644 index 86ddca1c56..0000000000 --- a/usr/src/pkg/license_files/lic_Emulex +++ /dev/null @@ -1,501 +0,0 @@ --------------------------------------------------------------------- - -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) 2004-2008 Emulex. -Emulex Leadville emlxs HBA device driver - -This program includes a StorEdge SAN foundation Software (SFS) FCA device -driver ("Leadville") and Emulex hardware-specific firmware binary files. You -may modify and redistribute the device driver code (but not the firmware -binary files) under License 1, version 1.0 of the Common Development and -Distribution License ("CDDL") as published by Sun Microsystems, Inc., and -reproduced below. The Emulex firmware binary files are licensed under License -2. - -REGARDLESS OF THE LICENSING MECHANISM USED OR APPLICABLE, THIS PROGRAM IS -PROVIDED BY EMULEX "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING -WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE, ARE DISCLAIMED. IN NO EVENT SHALL EMULEX BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS PROGRAM, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -LICENSEE ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT CREATE OR -GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY -INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR -OTHER PROPRIETARY RIGHT) EMBODIED IN ANY EMULEX HARDWARE OR FIRMWARE, EITHER -SOLELY OR IN COMBINATION WITH THIS PROGRAM. - -If Licensee uses or distributes only the device driver (without the firmware -binary files), only License #1 must accompany such device driver. Licensee -must include this entire file when Licensee uses or distributes both the -device driver and firmware binary files. - - - -LICENSE #1 - - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) - Version 1.0 - -1. Definitions. - -1.1. "Contributor" means each individual or entity that creates or -contributes to the creation of Modifications. - -1.2. "Contributor Version" means the combination of the Original Software, -prior Modifications used by a Contributor (if any), and the Modifications -made by that particular Contributor. - -1.3. "Covered Software" means (a) the Original Software, or (b) -Modifications, or (c) the combination of files containing Original Software -with files containing Modifications, in each case including portions thereof. - -1.4. "Executable" means the Covered Software in any form other than Source -Code. - -1.5. "Initial Developer" means the individual or entity that first makes -Original Software available under this License. - -1.6. "Larger Work" means a work which combines Covered Software or -portions thereof with code not governed by the terms of this License. - -1.7. "License" means this document. - -1.8. "Licensable" means having the right to grant, to the maximum extent -possible, whether at the time of the initial grant or subsequently acquired, -any and all of the rights conveyed herein. - -1.9. "Modifications" means the Source Code and Executable form of any of -the following: - - A. Any file that results from an addition to, deletion from or - modification of the contents of a file containing Original Software - or previous Modifications; - - B. Any new file that contains any part of the Original Software - or previous Modification; or - - C. Any new file that is contributed or otherwise made available - under the terms of this License. - -1.10. "Original Software" means the Source Code and Executable form of -computer software code that is originally released under this License. - -1.11. "Patent Claims" means any patent claim(s), now owned or hereafter -acquired, including without limitation, method, process, and apparatus -claims, in any patent Licensable by grantor. - -1.12. "Source Code" means (a) the common form of computer software code in -which modifications are made and (b) associated documentation included in or -with such code. - -1.13. "You" (or "Your") means an individual or a legal entity exercising -rights under, and complying with all of the terms of, this License. For legal -entities, "You" includes any entity which controls, is controlled by, or is -under common control with You. For purposes of this definition, "control" -means (a) the power, direct or indirect, to cause the direction or management -of such entity, whether by contract or otherwise, or (b) ownership of more -than fifty percent (50%) of the outstanding shares or beneficial ownership of -such entity. - -2. License Grants. - -2.1. The Initial Developer Grant. - -Conditioned upon Your compliance with Section 3.1 below and subject to third -party intellectual property claims, the Initial Developer hereby grants You a -world-wide, royalty-free, non-exclusive license: - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer, to use, reproduce, - modify, display, perform, sublicense and distribute the Original - Software (or portions thereof), with or without Modifications, and/or - as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using or selling - of Original Software, to make, have made, use, practice, sell, and - offer for sale, and/or otherwise dispose of the Original Software (or - portions thereof). - - (c) The licenses granted in Sections 2.1(a) and (b) are effective - on the date Initial Developer first distributes or otherwise makes - the Original Software available to a third party under the terms of - this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: (1) for code that You delete from the Original Software, or - (2) for infringements caused by: (i) the modification of the Original - Software, or (ii) the combination of the Original Software with other - software or devices. - -2.2. Contributor Grant. - -Conditioned upon Your compliance with Section 3.1 below and subject to third -party intellectual property claims, each Contributor hereby grants You a -world-wide, royalty-free, non-exclusive license: - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Contributor to use, reproduce, modify, - display, perform, sublicense and distribute the Modifications created - by such Contributor (or portions thereof), either on an unmodified - basis, with other Modifications, as Covered Software and/or as part - of a Larger Work; and - - (b) under Patent Claims infringed by the making, using, or - selling of Modifications made by that Contributor either alone and/or - in combination with its Contributor Version (or portions of such - combination), to make, use, sell, offer for sale, have made, and/or - otherwise dispose of: (1) Modifications made by that Contributor (or - portions thereof); and (2) the combination of Modifications made by - that Contributor with its Contributor Version (or portions of such - combination). - - (c) The licenses granted in Sections 2.2(a) and 2.2(b) are - effective on the date Contributor first distributes or otherwise - makes the Modifications available to a third party. - - (d) Notwithstanding Section 2.2(b) above, no patent license is - granted: (1) for any code that Contributor has deleted from the - Contributor Version; (2) for infringements caused by: (i) third party - modifications of Contributor Version, or (ii) the combination of - Modifications made by that Contributor with other software (except as - part of the Contributor Version) or other devices; or (3) under - Patent Claims infringed by Covered Software in the absence of - Modifications made by that Contributor. - -3. Distribution Obligations. - -3.1. Availability of Source Code. - -Any Covered Software that You distribute or otherwise make available in -Executable form must also be made available in Source Code form and that -Source Code form must be distributed only under the terms of this License. -You must include a copy of this License with every copy of the Source Code -form of the Covered Software You distribute or otherwise make available. You -must inform recipients of any such Covered Software in Executable form as to -how they can obtain such Covered Software in Source Code form in a reasonable -manner on or through a medium customarily used for software exchange. - -3.2. Modifications. - -The Modifications that You create or to which You contribute are governed by -the terms of this License. You represent that You believe Your Modifications -are Your original creation(s) and/or You have sufficient rights to grant the -rights conveyed by this License. - -3.3. Required Notices. - -You must include a notice in each of Your Modifications that identifies You -as the Contributor of the Modification. You may not remove or alter any -copyright, patent or trademark notices contained within the Covered Software, -or any notices of licensing or any descriptive text giving attribution to any -Contributor or the Initial Developer. - -3.4. Application of Additional Terms. - -You may not offer or impose any terms on any Covered Software in Source Code -form that alters or restricts the applicable version of this License or the -recipients' rights hereunder. You may choose to offer, and to charge a fee -for, warranty, support, indemnity or liability obligations to one or more -recipients of Covered Software. However, you may do so only on Your own -behalf, and not on behalf of the Initial Developer or any Contributor. You -must make it absolutely clear that any such warranty, support, indemnity or -liability obligation is offered by You alone, and You hereby agree to -indemnify the Initial Developer and every Contributor for any liability -incurred by the Initial Developer or such Contributor as a result of -warranty, support, indemnity or liability terms You offer. - -3.5. Distribution of Executable Versions. - -You may distribute the Executable form of the Covered Software under the -terms of this License or under the terms of a license of Your choice, which -may contain terms different from this License, provided that You are in -compliance with the terms of this License and that the license for the -Executable form does not attempt to limit or alter the recipient's rights in -the Source Code form from the rights set forth in this License. If You -distribute the Covered Software in Executable form under a different license, -You must make it absolutely clear that any terms which differ from this -License are offered by You alone, not by the Initial Developer or -Contributor. You hereby agree to indemnify the Initial Developer and every -Contributor for any liability incurred by the Initial Developer or such -Contributor as a result of any such terms You offer. - -3.6. Larger Works. - -You may create a Larger Work by combining Covered Software with other code -not governed by the terms of this License and distribute the Larger Work as a -single product. In such a case, You must make sure the requirements of this -License are fulfilled for the Covered Software. - -4. Versions of the License. - -4.1. New Versions. - -Sun Microsystems, Inc. is the initial license steward and may publish revised -and/or new versions of this License from time to time. Each version will be -given a distinguishing version number. Except as provided in Section 4.3, no -one other than the license steward has the right to modify this License. - -4.2. Effect of New Versions. - -You may always continue to use, distribute or otherwise make the Covered -Software available under the terms of the version of the License under which -You originally received the Covered Software. If the Initial Developer -includes a notice in the Original Software prohibiting it from being -distributed or otherwise made available under any subsequent version of the -License, You must distribute and make the Covered Software available under -the terms of the version of the License under which You originally received -the Covered Software. Otherwise, You may also choose to use, distribute or -otherwise make the Covered Software available under the terms of any -subsequent version of the License published by the license steward. - -4.3. Modified Versions. - -When You are an Initial Developer and You want to create a new license for -Your Original Software, You may create and use a modified version of this -License if You: (a) rename the license and remove any references to the name -of the license steward (except to note that the license differs from this -License); and (b) otherwise make it clear that the license contains terms -which differ from this License. - -5. DISCLAIMER OF WARRANTY. - -COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT -WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, -MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK -AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD -ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL -DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY -SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -6. TERMINATION. - -6.1. This License and the rights granted hereunder will terminate -automatically if You fail to comply with terms herein and fail to cure such -breach within 30 days of becoming aware of the breach. Provisions which, by -their nature, must remain in effect beyond the termination of this License -shall survive. - -6.2. If You assert a patent infringement claim (excluding declaratory -judgment actions) against Initial Developer or a Contributor (the Initial -Developer or Contributor against whom You assert such claim is referred to as -"Participant") alleging that the Participant Software (meaning the -Contributor Version where the Participant is a Contributor or the Original -Software where the Participant is the Initial Developer) directly or -indirectly infringes any patent, then any and all rights granted directly or -indirectly to You by such Participant, the Initial Developer (if the Initial -Developer is not the Participant) and all Contributors under Sections 2.1 -and/or 2.2 of this License shall, upon 60 days notice from Participant -terminate prospectively and automatically at the expiration of such 60 day -notice period, unless if within such 60 day period You withdraw Your claim -with respect to the Participant Software against such Participant either -unilaterally or pursuant to a written agreement with Participant. - -6.3. In the event of termination under Sections 6.1 or 6.2 above, all end -user licenses that have been validly granted by You or any distributor -hereunder prior to termination (excluding licenses granted to You by any -distributor) shall survive termination. - -7. LIMITATION OF LIABILITY. - -UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING -NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY -OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF -ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, -INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT -LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, -COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR -LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF -SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR -DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT -APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE -EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS -EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -8. U.S. GOVERNMENT END USERS. - -The Covered Software is a "commercial item," as that term is defined in 48 -C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as -that term is defined at 48 C.F.R. § 252.227-7014(a)(1)) and "commercial -computer software documentation" as such terms are used in 48 C.F.R. 12.212 -(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 -through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered -Software with only those rights set forth herein. This U.S. Government Rights -clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or -provision that addresses Government rights in computer software under this -License. - -9. MISCELLANEOUS. - -This License represents the complete agreement concerning subject matter -hereof. If any provision of this License is held to be unenforceable, such -provision shall be reformed only to the extent necessary to make it -enforceable. This License shall be governed by the law of the jurisdiction -specified in a notice contained within the Original Software (except to the -extent applicable law, if any, provides otherwise), excluding such -jurisdiction's conflict-of-law provisions. Any litigation relating to this -License shall be subject to the jurisdiction of the courts located in the -jurisdiction and venue specified in a notice contained within the Original -Software, with the losing party responsible for costs, including, without -limitation, court costs and reasonable attorneys' fees and expenses. The -application of the United Nations Convention on Contracts for the -International Sale of Goods is expressly excluded. Any law or regulation -which provides that the language of a contract shall be construed against the -drafter shall not apply to this License. You agree that You alone are -responsible for compliance with the United States export administration -regulations (and the export control laws and regulation of any other -countries) when You use, distribute or otherwise make available any Covered -Software. - -10. RESPONSIBILITY FOR CLAIMS. - -As between Initial Developer and the Contributors, each party is responsible -for claims and damages arising, directly or indirectly, out of its -utilization of rights under this License and You agree to work with Initial -Developer and Contributors to distribute such responsibility on an equitable -basis. Nothing herein is intended or shall be deemed to constitute any -admission of liability. - ------------------------------------------------------------------------------ -NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION -LICENSE (CDDL) -The OpenSolaris code released under the CDDL shall be governed by the laws of -the State of California (excluding conflict-of-law provisions). Any -litigation relating to this License shall be subject to the jurisdiction of -the Federal Courts of the Northern District of California and the state -courts of the State of California, with venue lying in Santa Clara County, -California. - - - -LICENSE #2 - -THIS PRODUCT CONTAINS FIRMWARE ("EMULEX FIRMWARE") THAT BELONGS TO EMULEX -CORPORATION ("EMULEX"), THE USE OF WHICH IS SUBJECT TO THIS LICENSE AGREEMENT -("AGREEMENT") UNLESS OTHERWISE AGREED TO IN WRITING BY EMULEX. INSTALLING OR -USING THE EMULEX FIRMWARE CONSTITUTES ACCEPTANCE OF ALL THE TERMS AND -CONDITIONS OF THIS AGREEMENT UNLESS OTHERWISE AGREED TO IN WRITING BY EMULEX. -IF LICENSEE DOES NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, -LICENSEE SHALL NOT INSTALL OR USE THE EMULEX FIRMWARE. WRITTEN APPROVAL IS -NOT A PREREQUISITE TO THE VALIDITY OR ENFORCEABILITY OF THIS AGREEMENT. - -1. Limited Licenses - -1.1 Derivatives. Emulex hereby grants Licensee the personal, -nontransferable, nonexclusive, royalty-free right and license to include the -Emulex Firmware in derivative works that Licensee may create under the terms -and conditions of License #1. For avoidance of doubt, Licensee acknowledges -that the Emulex Firmware is not licensed under nor otherwise subject to the -terms and conditions of License #1. - -1.2 Distribution. Emulex hereby grants Licensee the personal, -nontransferable, nonexclusive, royalty free, right and license to use, -distribute, and sublicense copies of Emulex Firmware solely for use with -Emulex hardware products for which the Emulex Firmware was written and that -Licensee has purchased from Sun Microsystems or its authorized distributors -or resellers. Such distribution may be on electronic media or via download -from Licensee's website or other electronic means. Licensee shall grant each -sublicensee a nonexclusive, nontransferable license to use the Emulex -Firmware in Object Code only and shall authorize such sublicensees to make -one archival copy of the Emulex Firmware. Licensee shall not use, reproduce, -duplicate, copy, or otherwise sublicense, disclose, distribute, or -disseminate the Emulex Firmware except as permitted under this Agreement. - -1.3 End User. Emulex grants Licensee a personal, worldwide, -nontransferable, nonexclusive, royalty-free right and license to use the -Emulex Firmware only with Emulex hardware products and without circumventing -any security or rights management features. - -1.4 Restrictions. Licensee agrees to maintain intact and not modify or -delete Emulex's copyright notice that is contained with each copy of the -Emulex Firmware. Licensee shall not (1) reverse engineer, reverse compile or -reverse assemble all or any part of the Emulex Firmware, (2) disseminate -performance information or analysis to any third party, other than solely for -product support purposes, from any source relating to the Emulex Firmware, or -cause or permit others to do either of both of the foregoing. Licensee -agrees to prevent any unauthorized copying of the Emulex Firmware. - -2. Intellectual Property Rights. The Emulex Firmware is licensed, not sold. -Emulex or its licensors retain all right, title and interest, including -without limitation all intellectual property rights, in and to all copies, -regardless of form or media, of the Emulex Firmware. The Emulex Firmware -contains trade secrets of Emulex and Licensee agrees that it shall employ -reasonable security precautions to maintain the confidentiality of such trade -secrets. - -3. Indemnity. Licensee shall defend, indemnify and hold Emulex harmless -from and against any and all claims, damages, liabilities, costs and expenses -(including, without limitation, attorneys' fees) arising out of Licensee's -breach of its obligations under this Agreement. - -4. Term and termination. The term of this Agreement shall continue until -Licensee (a) ceases exercising its rights under Section 1 of this Agreement, -(b) breaches a material term of this Agreement, or (c) gives written notice -of termination to Emulex. Upon termination of this Agreement, all copies of -the Emulex Firmware in the possession of Licensee shall be either returned to -Emulex or destroyed by Licensee. - -5. Warranty Disclaimer. Emulex makes no warranties whatsoever, express or -implied, with respect to the Emulex Firmware. Licensee agrees that the -Emulex Firmware is accepted and utilized "AS IS." EMULEX DISCLAIMS ANY AND -ALL PROMISES, REPRESENTATIONS, AND WARRANTIES, EXCEPT AS EXPRESSLY SET FORTH -IN THIS AGREEMENT, WITH RESPECT TO THE EMULEX FIRMWARE; ANY DATA, -INFORMATION, OR OTHER MATERIAL FURNISHED TO THE LICENSEE HEREUNDER, INCLUDING -THEIR CONDITION; CONFORMITY TO ANY REPRESENTATION OR DESCRIPTION; THE -EXISTENCE OF ANY LATENT OR PATENT DEFECTS; AND TITLE, MERCHANTABILITY, OR -FITNESS FOR A PARTICULAR PURPOSE OR USE. - -6. Limitation of Liability. Emulex shall have no liability to Licensee, or -any third party, whether in contract, tort, negligence or products liability -for any claim, loss of use, business interruption, lost data, lost files, or -for any indirect, special, incidental, or consequential damages of any kind -or nature whatsoever arising out of or in connection with the use of or -inability to use the Emulex Firmware or the performance or operation of the -Emulex Firmware, even if Emulex has been advised of the possibility of such -damages occurring. - -8. Miscellaneous. The laws of the state of California, without regard to -its choice of law rules, shall govern the interpretation and enforcement of -this Agreement. The parties are independent contractors of one another. -Nothing herein shall be deemed to create any relationship of agency, -partnership, or joint venture between the parties. Licensee represents that -it is acting on its own behalf and is not acting as an agent for or on behalf -of any third party, and further agrees that it may not assign its rights or -obligations under this Agreement without prior written consent of Emulex. -Both parties shall adhere to all applicable laws, regulations, and rules -relating to the export of Emulex Firmware and any other information provided -hereunder. If any term or condition of this Agreement is held invalid, -illegal or unenforceable by a court of competent jurisdiction, all the other -terms and conditions shall survive. The Emulex Firmware may be provided to -units or agencies of the U.S. government only as "commercial computer -firmware," "restricted computer firmware," or with "restricted rights" as -defined in applicable regulations, and may not be provided as source code. -Manufacturer is Emulex Design & Manufacturing Corporation, 3333 Susan St., -Costa Mesa, CA 92626. diff --git a/usr/src/pkg/license_files/lic_GPLv2 b/usr/src/pkg/license_files/lic_GPLv2 deleted file mode 100644 index eeb586b392..0000000000 --- a/usr/src/pkg/license_files/lic_GPLv2 +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/usr/src/pkg/license_files/lic_HP b/usr/src/pkg/license_files/lic_HP deleted file mode 100644 index 1fbdef3e55..0000000000 --- a/usr/src/pkg/license_files/lic_HP +++ /dev/null @@ -1 +0,0 @@ -Copyright 2010 Hewlett-Packard Development Company, L.P. diff --git a/usr/src/pkg/license_files/lic_Qlogic b/usr/src/pkg/license_files/lic_Qlogic deleted file mode 100644 index 7f9c1fd7c0..0000000000 --- a/usr/src/pkg/license_files/lic_Qlogic +++ /dev/null @@ -1,594 +0,0 @@ --------------------------------------------------------------------- - -Copyright (c) 2003-2008 QLogic Corporation -QLogic Leadville qlc HBA device driver - -This program includes a device driver for the QLogic Leadville qlc HBA -device driver distributed with QLogic hardware specific firmware binary -files. You may modify and redistribute the device driver code (but not -the firmware binary files) under License "A", version 1.0 of the Common -Development and Distribution License ("CDDL") as published by Sun -Microsystems, Inc. and reproduced below. The hardware binary files are -licensed under License "B". - - REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE, -THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS" AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT -CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR -OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT, TRADE -SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN ANY OTHER -QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN COMBINATION WITH THIS -PROGRAM. - - -License A: - - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) - Version 1.0 - -1. Definitions. - -1.1. "Contributor" means each individual or entity that creates or - contributes to the creation of Modifications. - -1.2. "Contributor Version" means the combination of the Original - Software, prior Modifications used by a Contributor (if any), - and the Modifications made by that particular Contributor. - -1.3. "Covered Software" means (a) the Original Software, or (b) - Modifications, or (c) the combination of files containing - Original Software with files containing Modifications, in - each case including portions thereof. - -1.4. "Executable" means the Covered Software in any form other than - Source Code. - -1.5. "Initial Developer" means the individual or entity that first - makes Original Software available under this License. - -1.6. "Larger Work" means a work which combines Covered Software or - portions thereof with code not governed by the terms of this - License. - -1.7. "License" means this document. - -1.8. "Licensable" means having the right to grant, to the maximum - extent possible, whether at the time of the initial grant or - subsequently acquired, any and all of the rights conveyed herein. - -1.9. "Modifications" means the Source Code and Executable form of any - of the following: - - A. Any file that results from an addition to, deletion from or - modification of the contents of a file containing Original - Software or previous Modifications; - - B. Any new file that contains any part of the Original Software - or previous Modification; or - - C. Any new file that is contributed or otherwise made available - under the terms of this License. - -1.10. "Original Software" means the Source Code and Executable form of - computer software code that is originally released under this - license. - -1.11. "Patent Claims" means any patent claim(s), now owned or hereafter - acquired, including without limitation, method, process, and - apparatus claims, in any patent Licensable by grantor. - -1.12. "Source Code" means (a) the common form of computer software code - in which modifications are made and (b) associated documentation - included in or with such code. - -1.13. "You" (or "Your") means an individual or a legal entity - exercising rights under, and complying with all of the terms of, - this License. For legal entities, "You" includes any entity which - controls, is controlled by, or is under common control with You. - For purposes of this definition, "control" means (a) the power, - direct or indirect, to cause the direction or management of such - entity, whether by contract or otherwise, or (b) ownership of - more than fifty percent (50%) of the outstanding shares or - beneficial ownership of such entity. - -2. License Grants. - -2.1. The Initial Developer Grant. - - Conditioned upon Your compliance with Section 3.1 below and - subject to third party intellectual property claims, the Initial - Developer hereby grants You a world-wide, royalty-free, non- - exclusive license: - - (a) under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer, to use, reproduce, - modify, display, perform, sublicense and distribute the - Original Software (or portions thereof), with or without - Modifications, and/or as part of a Larger Work; and - - (b) under Patent Claims infringed by the making, using or selling - of Original Software, to make, have made, use, practice, sell, - and offer for sale, and/or otherwise dispose of the Original - Software (or portions thereof). - - (c) The licenses granted in Sections 2.1(a) and (b) are effective - on the date Initial Developer first distributes or otherwise - makes the Original Software available to a third party under - the terms of this License. - - (d) Notwithstanding Section 2.1(b) above, no patent license is - granted: (1) for code that You delete from the Original - Software, or (2) for infringements caused by: (i) the - modification of the Original Software, or (ii) the combination - of the Original Software with other software or devices. - -2.2. Contributor Grant. - -Conditioned upon Your compliance with Section 3.1 below and subject to -third party intellectual property claims, each Contributor hereby -grants You a world-wide, royalty-free, non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by Contributor to use, reproduce, modify, display, - perform, sublicense and distribute the Modifications created by - such Contributor (or portions thereof), either on an unmodified - basis, with other Modifications, as Covered Software and/or as part - of a Larger Work; and - -(b) under Patent Claims infringed by the making, using, or selling of - Modifications made by that Contributor either alone and/or in - combination with its Contributor Version (or portions of such - combination), to make, use, sell, offer for sale, have made, and/or - otherwise dispose of: (1) Modifications made by that Contributor - (or portions thereof); and (2) the combination of Modifications - made by that Contributor with its Contributor Version (or portions - of such combination). - -(c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on - the date Contributor first distributes or otherwise makes the - Modifications available to a third party. - -(d) Notwithstanding Section 2.2(b) above, no patent license is granted: - (1) for any code that Contributor has deleted from the Contributor - Version; (2) for infringements caused by: (i) third party - modifications of Contributor Version, or (ii) the combination of - Modifications made by that Contributor with other software (except - as part of the Contributor Version) or other devices; or (3) under - Patent Claims infringed by Covered Software in the absence of - Modifications made by that Contributor. - -3. Distribution Obligations. - -3.1. Availability of Source Code. - - Any Covered Software that You distribute or otherwise make - available in Executable form must also be made available in Source - Code form and that Source Code form must be distributed only under - the terms of this License. You must include a copy of this License - with every copy of the Source Code form of the Covered Software - You distribute or otherwise make available. You must inform - recipients of any such Covered Software in xecutable form as to - how they can obtain such Covered Software in Source Code form in a - reasonable manner on or through a medium customarily used for - software exchange. - -3.2. Modifications. - - The Modifications that You create or to which You contribute are - governed by the terms of this License. You represent that You - believe Your Modifications are Your original creation(s) and/or - You have sufficient rights to grant the rights conveyed by this - License. - -3.3. Required Notices. - - You must include a notice in each of Your Modifications that - identifies You as the Contributor of the Modification. You may not - remove or alter any copyright, patent or trademark notices - contained within the Covered Software, or any notices of licensing - or any descriptive text giving attribution to any Contributor or - the Initial Developer. - -3.4. Application of Additional Terms. - - You may not offer or impose any terms on any Covered Software in - Source Code form that alters or restricts the applicable version - of this License or the recipients' rights hereunder. You may - choose to offer, and to charge a fee for, warranty, support, - indemnity or liability obligations to one or more recipients of - Covered Software. However, you may do so only on Your own behalf, - and not on behalf of the Initial Developer or any Contributor. You - must make it absolutely clear that any such warranty, support, - indemnity or liability obligation is offered by You alone, and You - hereby agree to indemnify the Initial Developer and every - Contributor for any liability incurred by the Initial Developer or - such Contributor as a result of warranty, support, indemnity or - liability terms You offer. - -3.5. Distribution of Executable Versions. - - You may distribute the Executable form of the Covered Software - under the terms of this License or under the terms of a license of - Your choice, which may contain terms different from this License, - provided that You are in compliance with the terms of this License - and that the license for the Executable form does not attempt to - limit or alter the recipient's rights in the Source Code form from - the rights set forth in this License. If You distribute the - Covered Software in Executable form under a different license, You - must make it absolutely clear that any terms which differ from - this License are offered by You alone, not by the Initial - Developer or Contributor. You hereby agree to indemnify the - Initial Developer and every Contributor for any liability incurred - by the Initial Developer or such Contributor as a result of any - such terms You offer. - -3.6. Larger Works. - - You may create a Larger Work by combining Covered Software with - other code not governed by the terms of this License and - distribute the Larger Work as a single product. In such a case, - You must make sure the requirements of this License are fulfilled - for the Covered Software. - -4. Versions of the License. - -4.1. New Versions. - - Sun Microsystems, Inc. is the initial license steward and may - publish revised and/or new versions of this License from time to - time. Each version will be given a distinguishing version number. - Except as provided in Section 4.3, no one other than the license - steward has the right to modify this License. - -4.2. Effect of New Versions. - - You may always continue to use, distribute or otherwise make the - Covered Software available under the terms of the version of the - License under which You originally received the Covered Software. - If the Initial Developer includes a notice in the Original - Software prohibiting it from being distributed or otherwise made - available under any subsequent version of the License, You must - distribute and make the Covered Software available under the terms - of the version of the License under which You originally received - the Covered Software. Otherwise, You may also choose to use, - distribute or otherwise make the - Covered Software available under the terms of any subsequent - version of the License published by the license steward. - -4.3. Modified Versions. - - When You are an Initial Developer and You want to create a new - license for Your Original Software, You may create and use a - modified version of this License if You: (a) rename the license - and remove any references to the name of the license steward - (except to note that the license differs from this License); and - (b) otherwise make it clear that the license contains terms which - differ from this License. - -5. DISCLAIMER OF WARRANTY. - - COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" - BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, - INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED - SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR - PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND - PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY - COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE - INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY - NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF - WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. - NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT - UNDER THIS DISCLAIMER. - -6. TERMINATION. - -6.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to - cure such breach within 30 days of becoming aware of the breach. - Provisions which, by their nature, must remain in effect beyond - the termination of this License shall survive. - -6.2. If You assert a patent infringement claim (excluding declaratory - judgment actions) against Initial Developer or a Contributor (the - Initial Developer or Contributor against whom You assert such - claim is referred to as "Participant") alleging that the - Participant Software (meaning the Contributor Version where the - Participant is a Contributor or the Original Software where the - Participant is the Initial Developer) directly or indirectly - infringes any patent, then any and all rights granted directly or - indirectly to You by such Participant, the Initial Developer (if - the Initial Developer is not the Participant) and all Contributors - under Sections 2.1 and/or 2.2 of this License - shall, upon 60 days notice from Participant terminate - prospectively and automatically at the expiration of such 60 day - notice period, unless if within such 60 day period You withdraw - Your claim with respect to the Participant Software against such - Participant either unilaterally or pursuant to a written agreement - with Participant. - -6.3. If You assert a patent infringement claim against Participant - alleging that the Participant Software directly or indirectly - infringes any patent where such claim is resolved (such as by - license or settlement) prior to the initiation of patent - infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections 2.1 or 2.2 shall be - taken into account in determining the amount or value of any - payment or license. - -6.4. In the event of termination under Sections 6.1 or 6.2 above, all - end user licenses that have been validly granted by You or any - distributor hereunder prior to termination (excluding licenses - granted to You by any distributor) shall survive termination. - -7. LIMITATION OF LIABILITY. - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT - (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE - INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF - COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE - LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR - CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT - LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER - FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR - LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE - POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL - NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM - SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS - SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR - LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS - EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. - -8. U.S. GOVERNMENT END USERS. - - The Covered Software is a "commercial item" as that term is defined - in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer - software" (as that term is defined at 48 C.F.R. " 252.227-7014(a) - (1)) and "commercial computer software documentation" as such terms - are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. - 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all - U.S. Government End Users acquire Covered Software with only those - rights set forth herein. This U.S. Government Rights clause is in - lieu of, and supersedes, any other FAR, DFAR, or other clause or - provision that addresses Government rights in computer software - under this License. - -9. MISCELLANEOUS. - - This License represents the complete agreement concerning subject - matter hereof. If any provision of this License is held to be - unenforceable, such provision shall be reformed only to the extent - necessary to make it enforceable. This License shall be governed by - the law of the jurisdiction specified in a notice contained within - the Original Software (except to the extent applicable law, if any, - provides otherwise), excluding such jurisdiction's conflict-of-law - provisions. Any litigation relating to this License shall be subject - to the jurisdiction of the courts located in the jurisdiction and - venue specified in a notice contained within the Original Software, - with the losing party responsible for costs, including, without - limitation, court costs and reasonable attorneys' fees and expenses. - The application of the United Nations Convention on Contracts for - the International Sale of Goods is expressly excluded. Any law or - regulation which provides that the language of a contract shall be - construed against the drafter shall not apply to this License. You - agree that You alone are responsible for compliance with the United - States export administration regulations (and the export control - laws and regulation of any other countries) when You use, distribute - or otherwise make available any Covered Software. - -10. RESPONSIBILITY FOR CLAIMS. - - As between Initial Developer and the Contributors, each party is - responsible for claims and damages arising, directly or indirectly, - out of its utilization of rights under this License and You agree to - work with Initial Developer and Contributors to distribute such - responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - - ----------------------------------------------------------------------- -NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND -DISTRIBUTION LICENSE (CDDL) - -The OpenSolaris code released under the CDDL shall be governed by the -laws of the State of California (excluding conflict-of-law provisions). -Any litigation relating to this License shall be subject to the -jurisdiction of the Federal Courts of the Northern District of -California and the state courts of the State of California, with venue -lying in Santa Clara County, California. - - - -License B: - -THIS PRODUCT CONTAINS COMPUTER PROGRAMS AND RELATED DOCUMENTATION -("SOFTWARE") THAT BELONG TO QLOGIC CORPORATION ("QLOGIC"), THE USE OF WHICH -IS SUBJECT TO THIS END USER SOFTWARE LICENSE AGREEMENT ("AGREEMENT") UNLESS -OTHERWISE AGREED TO IN WRITING BY QLOGIC. CLICKING ON THE "AGREE" BUTTON -BELOW, INSTALLING/USING THE SOFTWARE OR ENTERING A LICENSE KEY CONSTITUTES -ACCEPTANCE BY LICENSEE ("LICENSEE" MEANS YOU OR THE BUSINESS ENTITY ON WHOSE -BEHALF YOU USE OR INSTALL THE SOFTWARE, AS APPLICABLE) OF ALL THE TERMS AND -CONDITIONS OF THIS AGREEMENT UNLESS OTHERWISE AGREED TO IN WRITING BY QLOGIC. -IF LICENSEE DOES NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, -LICENSEE SHALL NOT INSTALL/USE THE SOFTWARE OR ENTER A LICENSE KEY. WRITTEN -APPROVAL IS NOT A PREREQUISITE TO THE VALIDITY OR ENFORCEABILITY OF THIS -AGREEMENT. - -1. License Grant. Subject to the terms and conditions of this - Agreement, QLogic grants Licensee a limited, non-exclusive license - to redistribute, install, download and/or use the Software (in - object code form only) with certain approved products manufactured - by or for QLogic and approved products manufactured by or for an OEM - customer of QLogic ("QLogic Approved Products"). This license is - only available to original end user purchasers of QLogic Approved - Products that have been purchased through QLogic authorized - distribution channels or approved OEM distribution channels. This - license is not available to any end users of QLogic products who - have purchased QLogic products, which have previously been used and - the license is not available to any purchaser of QLogic application - specific integrated circuits ("ASICs") or any product incorporating - an ASIC, unless the product incorporating the ASIC is a QLogic - Approved Product. No rights or licenses in the Software are granted - to Licensee other than those rights expressly granted in this - Agreement. Nothing in this License entitles Licensee to any - upgrades or updates to, or future releases of, the Software. If - Licensee redistributes the Software, then Licensee shall reproduce - all copyright notices and must include this Agreement or an - agreement which is at least as restrictive as this Agreement. - -2. Permitted Use. Licensee may only install and use the Software in - accordance with the documentation provided with the Software and - with QLogic Approved Products. - -3. Intellectual Property Rights. The Software contains or embodies - intellectual property of QLogic (or any of its licensors). The - structure, organization and code are valuable trade secrets of - QLogic (or its licensors). QLogic and/or its licensors do not grant, - convey or license to Licensee any rights under any patents, - copyrights, trademarks or any other intellectual property except as - specifically granted herein. The Software is protected under U.S. - copyright laws, international treaty provisions and applicable laws - (including patent laws, if applicable) of the country in which it is - being used. Any unauthorized duplication of the Software is - expressly forbidden. - -4. Ownership of Software. Notwithstanding anything to the contrary, - QLogic and its licensors retain all title to and, except as - expressly and unambiguously licensed herein, all rights and interest - in (i) the Software, all copies and derivative works thereof (by - whomever produced), and (ii) all copyright rights, patent rights, - trade secret rights, moral rights and all other intellectual - property and proprietary rights anywhere in the world in the - Software. The Software is only licensed to Licensee and is not - sold. - -5. Restrictions and Cooperation. Licensee shall not (and shall not - allow any third party to) (i) decompile, disassemble, or otherwise - reverse engineer or attempt to reconstruct or discover any source - code, or underlying ideas or algorithms of the Software (except to - the extent expressly permitted under applicable law); (ii) provide, - lease, lend, use for timesharing or otherwise use or allow others to - use the Software to or for the benefit of third parties; (iii) - except as specified in the applicable user documentation, modify, - incorporate into or with other hardware or software, or create a - derivative work of any part of the Software; (iv) disseminate - performance information or analysis from any source relating to the - Software; (v) make any copies of the Software except as required to - use the Software as licensed hereunder, except for one (1) copy - solely for archival and back-up purposes, or (vi) remove any - product identification, copyright notice or other proprietary legend - from the Software. Licensee agrees to cooperate with QLogic and its - licensors in connection with their efforts to protect their - copyright/patent rights and other legal rights in the Software. - QLogic may, from time to time, implement additional security - measures for the Software, and Licensee shall cooperate with - such measures and be responsible for installing upgrades that - include such measures. - -6. Further Obligations. Licensee shall defend, indemnify and hold - QLogic harmless from and against any and all claims, damages, - liabilities, costs and expenses (including, without limitation, - attorneys" fees) arising out of Licensee"s breach of its obligations - under this Agreement. - -7. Term and Termination. This Agreement will become effective on the - date Licensee clicks on the "Agree" button below or otherwise uses - the Software and will remain in force until terminated. Licensee - may terminate this Agreement at any time, and QLogic may terminate - this Agreement if Licensee breaches any of the terms or conditions - hereunder. Licensee agrees to destroy or return to QLogic the - original and all copies of the Software immediately upon any - termination of this Agreement. - -8. Confidentiality. Licensee acknowledges that the Software contains - valuable trade secrets of QLogic and other information proprietary - to QLogic and its licensors. Licensee shall: (i)"keep confidential - such trade secrets and proprietary information, including without - limitation all information concerning ideas and algorithms related - to the Software, (ii)"disclose such information only to its - employees and agents to the extent required to use the Software - under the terms of this Agreement and (iii)"bind its employees, - consultants, agents and other third parties in writing to maintain - the confidentiality of such trade secrets and proprietary - information and not use or disclose such information except as - permitted in this Agreement. - -9. Limited Warranty and Disclaimer. THE SOFTWARE IS PROVIDED "AS IS" - WITHOUT ANY WARRANTY OF ANY KIND INCLUDING, WITHOUT LIMITATION, ANY - WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. QLOGIC DOES NOT WARRANT THAT THE SOFTWARE IS - ERROR-FREE OR THAT IT WILL OPERATE WITHOUT INTERRUPTION. QLOGIC - DOES NOT WARRANT, GUARANTEE OR MAKE ANY REPRESENTATION REGARDING THE - USE, OR THE RESULTS OF THE USE OF THE SOFTWARE INCLUDING, WITHOUT - LIMITATION, THE CORRECTNESS, ACCURACY OR RELIABILITY OF SUCH USE OR - RESULTS. - -10. Limitation of Liability. TO THE MAXIMUM EXTENT PERMITTED BY LAW, - IN NO EVENT WILL QLOGIC BE LIABLE TO LICENSEE OR ANY THIRD PARTY - FOR ANY CONSEQUENTIAL, INCIDENTAL OR SPECIAL DAMAGES, INCLUDING, - WITHOUT LIMITATION, LOST PROFITS, LOST DATA OR LOST SAVINGS, OR FOR - THE COST OF PROCUREMENT OF SUBSTITUTE GOODS, SERVICES OR TECHNOLOGY - EVEN IF QLOGIC HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, - OR FOR ANY CLAIM BY ANY THIRD PARTY. - -11. Export. Licensee represents, warrants and agrees that it will not, - directly or indirectly, export, re-export or transmit the Software - or any part thereof to any country in which such export, re-export - or transmission is restricted by any applicable U.S. regulation or - statute, without the prior written consent of both QLogic and, if - required, of the Bureau of Export Administration of the U.S. - Department of Commerce, or such other governmental entity as may - have jurisdiction over such export or transmission. In addition to - the above, Software may not, in the absence of authorization by - U.S. and local law and regulations, as required, be used by or - exported or reexported to (i) any U.S. sanctioned or embargoed - country, or to nationals or residents of such countries; or (ii) - any person, entity, organization or other party identified on the - U.S. Department of Commerce's Denied Persons or Entity List, the - U.S. Department of Treasury's Specially Designated Nationals or - Blocked Persons Lists, or the Department of State's Debarred - Parties List, as published and revised from time to time; or - (iii) any party where the end-use involves nuclear, - chemical/biological weapons, rocket systems or unmanned air - vehicles. - -12. Miscellaneous. A party"s failure to exercise or its delay in - exercising any rights hereunder will not be deemed to be a waiver - of such right. If any provision of this Agreement shall be held by - any court of competent jurisdiction to be unenforceable or invalid, - that provision shall be limited or eliminated to the minimum extent - necessary so that this Agreement shall otherwise remain in full - force and effect and enforceable. This Agreement shall be - construed pursuant to the laws of the State of California and the - United States without regard to conflicts of laws provisions - thereof and without regard to the United Nations Convention on - Authority for the International Sale of Goods. Licensee - irrevocably submits to the jurisdiction of any state or federal - court sitting in the State of California, United States of America, - and consents to venue in such forum with respect to any action or - proceeding that relates to this Agreement. No amendment - to or modification of this Agreement will be binding unless in - writing and signed by a duly authorized officer of QLogic. The - provisions of Sections 3-11 shall survive termination of this - Agreement. This Agreement is in the English language only, which - language shall be controlling and any revision of this Agreement in - any other language shall not be binding. Both parties agree that - this Agreement is the complete and exclusive statement of the - mutual understanding of the parties and supersedes and cancels all - previous written and oral agreements and communications relating to - the subject matter of this Agreement. NO VENDOR, DISTRIBUTOR, - DEALER, RETAILER, SALES PERSON OR OTHER PERSON IS AUTHORIZED TO - MODIFY THIS AGREEMENT OR TO MAKE ANY WARRANTY, REPRESENTATION OR - PROMISE WHICH IS DIFFERENT THAN, OR IN ADDITION TO, THE - REPRESENTATIONS OR PROMISES IN THIS AGREEMENT. - diff --git a/usr/src/pkg/license_files/lic_SUNWhwdata b/usr/src/pkg/license_files/lic_SUNWhwdata deleted file mode 100644 index 28030450af..0000000000 --- a/usr/src/pkg/license_files/lic_SUNWhwdata +++ /dev/null @@ -1,43 +0,0 @@ -# List of PCI ID's -# -# Maintained by Martin Mares <mj@ucw.cz> and other volunteers from the -# Linux PCI ID's Project at http://pciids.sf.net/. -# -# New data are always welcome, especially if accurate. If you have -# anything to contribute, please follow the instructions at the web site -# or send a diff -u against the most recent pci.ids to pci-ids@ucw.cz. -# -# This file can be distributed under either the GNU General Public License -# (version 2 or higher) or the 3-clause BSD License. -# -# Daily snapshot on Fri 2006-08-04 01:05:03 - -Sun chooses to license this file under the 3-clause BSD license, reproduced -below. For the purposes of this license, "copyright holder" should be -considered to be Martin Mares and other volunteers from the Linux PCI ID's -Project, and "year" should be 2006 - -* Copyright (c) <year>, <copyright holder> -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the <organization> nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/usr/src/pkg/license_files/lic_SUNWroute b/usr/src/pkg/license_files/lic_SUNWroute deleted file mode 100644 index 080a9651d8..0000000000 --- a/usr/src/pkg/license_files/lic_SUNWroute +++ /dev/null @@ -1,30 +0,0 @@ -Copyright 1994-2001 FreeBSD, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided with - the distribution. - -THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The views and conclusions contained in the software and documentation -are those of the authors and should not be interpreted as representing -official policies, either expressed or implied, of the FreeBSD Project -or FreeBSD, Inc. diff --git a/usr/src/pkg/license_files/lic_gss b/usr/src/pkg/license_files/lic_gss deleted file mode 100644 index 611e7a538d..0000000000 --- a/usr/src/pkg/license_files/lic_gss +++ /dev/null @@ -1,37 +0,0 @@ - Copyright (c) 2001 Carnegie Mellon University. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "Carnegie Mellon University" must not be used to - endorse or promote products derived from this software without - prior written permission. For permission or any other legal - details, please contact - Office of Technology Transfer - Carnegie Mellon University - 5000 Forbes Avenue - Pittsburgh, PA 15213-3890 - (412) 268-4387, fax: (412) 268-7395 - tech-transfer@andrew.cmu.edu - - 4. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes software developed by Computing Services - at Carnegie Mellon University (http://www.cmu.edu/computing/)." - - CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO - THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE - FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/usr/src/pkg/license_files/lic_iprb b/usr/src/pkg/license_files/lic_iprb deleted file mode 100644 index 88d6a805f2..0000000000 --- a/usr/src/pkg/license_files/lic_iprb +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 1999-2001, Intel Corporation - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. Neither the name of Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/usr/src/pkg/manifests/SUNWbeadm.mf b/usr/src/pkg/manifests/SUNWbeadm.mf new file mode 100644 index 0000000000..5135ad7a36 --- /dev/null +++ b/usr/src/pkg/manifests/SUNWbeadm.mf @@ -0,0 +1,28 @@ +# +# 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. +# + +set name=pkg.fmri value=pkg:/SUNWbeadm@0.5.11,5.11-0.133 +set name=pkg.renamed value=true +set name=variant.arch value=$(ARCH) +depend fmri=pkg:/install/beadm@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 3040fdf633..b4db686e82 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -47,6 +47,7 @@ dir path=etc/ftpd group=sys dir path=etc/inet group=sys dir path=etc/init.d group=sys dir path=etc/lib group=sys +dir path=etc/logadm.d group=sys dir path=etc/mail group=mail dir path=etc/net group=sys dir path=etc/net/ticlts group=sys @@ -70,7 +71,6 @@ dir path=etc/security/dev group=sys dir path=etc/security/exec_attr.d group=sys dir path=etc/security/lib group=sys dir path=etc/security/prof_attr.d group=sys -dir path=etc/security/spool group=sys dir path=etc/skel group=sys dir path=etc/svc group=sys dir path=etc/svc/profile group=sys @@ -161,6 +161,8 @@ dir path=usr/lib/crypto dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/lib/fs group=sys +dir path=usr/lib/fs/autofs group=sys +dir path=usr/lib/fs/autofs/$(ARCH64) group=sys dir path=usr/lib/fs/cachefs group=sys dir path=usr/lib/fs/ctfs group=sys dir path=usr/lib/fs/dev group=sys @@ -288,6 +290,7 @@ dir path=var/inet group=sys dir path=var/ld dir path=var/ld/$(ARCH64) dir path=var/log group=sys +dir path=var/logadm dir path=var/mail group=mail mode=1777 dir path=var/mail/:saved group=mail mode=0775 dir path=var/news @@ -362,7 +365,6 @@ file path=etc/default/cron group=sys preserve=true file path=etc/default/devfsadm group=sys preserve=true file path=etc/default/fs group=sys preserve=true file path=etc/default/init group=sys preserve=true -file path=etc/default/kbd group=sys preserve=true file path=etc/default/keyserv group=sys preserve=true file path=etc/default/login group=sys preserve=true file path=etc/default/nss group=sys preserve=true @@ -397,7 +399,6 @@ file path=etc/inet/wanboot.conf.sample group=sys mode=0444 file path=etc/init.d/PRESERVE group=sys mode=0744 preserve=true file path=etc/init.d/README group=sys preserve=true file path=etc/init.d/cachefs.daemon group=sys mode=0744 preserve=true -file path=etc/init.d/deallocate group=sys mode=0744 preserve=true file path=etc/init.d/ldap.client group=sys mode=0744 file path=etc/init.d/mkdtab group=sys mode=0744 preserve=true file path=etc/init.d/nscd group=sys mode=0744 @@ -406,7 +407,7 @@ file path=etc/init.d/ufs_quota group=sys mode=0744 preserve=true file path=etc/inittab group=sys preserve=true file path=etc/ioctl.syscon group=sys preserve=true file path=etc/ksh.kshrc group=sys preserve=renameold -file path=etc/logadm.conf group=sys preserve=true +file path=etc/logadm.conf group=sys preserve=true timestamp=19700101T000000Z file path=etc/logindevperm group=sys preserve=true file path=etc/magic mode=0444 file path=etc/mail/mailx.rc preserve=true @@ -440,15 +441,11 @@ file path=etc/saf/_sactab group=sys preserve=true file path=etc/saf/_sysconfig group=sys preserve=true file path=etc/saf/zsmon/_pmtab group=sys preserve=true file path=etc/security/audit_class group=sys preserve=renamenew -file path=etc/security/audit_control group=sys preserve=renamenew file path=etc/security/audit_event group=sys preserve=renamenew -file path=etc/security/audit_user group=sys preserve=renamenew file path=etc/security/audit_warn group=sys mode=0740 preserve=renamenew file path=etc/security/auth_attr group=sys preserve=true \ timestamp=19700101T000000Z file path=etc/security/auth_attr.d/SUNWcs group=sys -file path=etc/security/bsmconv group=sys mode=0740 -file path=etc/security/bsmunconv group=sys mode=0740 file path=etc/security/crypt.conf group=sys preserve=renamenew file path=etc/security/dev/audio mode=0400 file path=etc/security/dev/fd0 mode=0400 @@ -526,6 +523,7 @@ 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/dns/install.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 @@ -535,6 +533,7 @@ 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-install.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 @@ -555,6 +554,7 @@ file path=lib/svc/manifest/network/shares/reparsed.xml group=sys mode=0444 file path=lib/svc/manifest/network/socket-filter-kssl.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/auditset.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 @@ -563,6 +563,7 @@ 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/allocate.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 @@ -579,6 +580,7 @@ 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/logadm-upgrade.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 @@ -595,6 +597,7 @@ file path=lib/svc/method/boot-archive-update mode=0555 file path=lib/svc/method/console-login mode=0555 file path=lib/svc/method/devices-audio mode=0555 file path=lib/svc/method/devices-local mode=0555 +file path=lib/svc/method/dns-install mode=0555 file path=lib/svc/method/fs-local mode=0555 file path=lib/svc/method/fs-minimal mode=0555 file path=lib/svc/method/fs-root mode=0555 @@ -604,9 +607,11 @@ file path=lib/svc/method/identity-node mode=0555 file path=lib/svc/method/inetd-upgrade mode=0555 file path=lib/svc/method/keymap mode=0555 file path=lib/svc/method/ldap-client mode=0555 +file path=lib/svc/method/logadm-upgrade mode=0555 file path=lib/svc/method/manifest-import mode=0555 file path=lib/svc/method/mpxio-upgrade mode=0555 file path=lib/svc/method/net-init mode=0555 +file path=lib/svc/method/net-install mode=0555 file path=lib/svc/method/net-ipmgmt mode=0555 file path=lib/svc/method/net-ipqos mode=0555 file path=lib/svc/method/net-iptun mode=0555 @@ -619,7 +624,9 @@ file path=lib/svc/method/net-routing-setup mode=0555 file path=lib/svc/method/net-svc mode=0555 file path=lib/svc/method/rmtmpfiles mode=0555 file path=lib/svc/method/rpc-bind mode=0555 +file path=lib/svc/method/svc-allocate mode=0555 file path=lib/svc/method/svc-auditd mode=0555 +file path=lib/svc/method/svc-auditset mode=0555 file path=lib/svc/method/svc-boot-config mode=0555 file path=lib/svc/method/svc-consadm mode=0555 file path=lib/svc/method/svc-cron mode=0555 @@ -879,6 +886,7 @@ file path=usr/bin/true mode=0555 file path=usr/bin/tty mode=0555 file path=usr/bin/tzselect mode=0555 file path=usr/bin/updatemedia mode=0555 +file path=usr/bin/userattr mode=0555 file path=usr/bin/vmstat mode=0555 file path=usr/bin/which mode=0555 file path=usr/bin/who mode=0555 @@ -1023,9 +1031,7 @@ file path=usr/lib/fs/ufs/ufsrestore mode=4555 file path=usr/lib/fs/ufs/volcopy mode=0555 file path=usr/lib/getoptcvt mode=0555 file path=usr/lib/help/auths/locale/C/AllSolAuthsHeader.html -file path=usr/lib/help/auths/locale/C/AuditConfig.html file path=usr/lib/help/auths/locale/C/AuditHeader.html -file path=usr/lib/help/auths/locale/C/AuditRead.html file path=usr/lib/help/auths/locale/C/AuthJobsAdmin.html file path=usr/lib/help/auths/locale/C/AuthJobsUser.html file path=usr/lib/help/auths/locale/C/AuthProfmgrAssign.html @@ -1067,6 +1073,7 @@ file path=usr/lib/help/auths/locale/C/NetworkVRRP.html file path=usr/lib/help/auths/locale/C/PriAdmin.html file path=usr/lib/help/auths/locale/C/ProfmgrHeader.html file path=usr/lib/help/auths/locale/C/RoleHeader.html +file path=usr/lib/help/auths/locale/C/SmfAllocate.html file path=usr/lib/help/auths/locale/C/SmfAutofsStates.html file path=usr/lib/help/auths/locale/C/SmfCoreadmStates.html file path=usr/lib/help/auths/locale/C/SmfCronStates.html @@ -1081,6 +1088,7 @@ file path=usr/lib/help/auths/locale/C/SmfIdmapStates.html file path=usr/lib/help/auths/locale/C/SmfInetdStates.html file path=usr/lib/help/auths/locale/C/SmfLocationStates.html file path=usr/lib/help/auths/locale/C/SmfMDNSStates.html +file path=usr/lib/help/auths/locale/C/SmfManageAudit.html file path=usr/lib/help/auths/locale/C/SmfManageHeader.html file path=usr/lib/help/auths/locale/C/SmfManageHotplug.html file path=usr/lib/help/auths/locale/C/SmfManageZFSSnap.html @@ -1102,6 +1110,7 @@ file path=usr/lib/help/auths/locale/C/SmfSendmailStates.html file path=usr/lib/help/auths/locale/C/SmfSshStates.html file path=usr/lib/help/auths/locale/C/SmfSyslogStates.html file path=usr/lib/help/auths/locale/C/SmfVRRPStates.html +file path=usr/lib/help/auths/locale/C/SmfValueAudit.html file path=usr/lib/help/auths/locale/C/SmfValueCoreadm.html file path=usr/lib/help/auths/locale/C/SmfValueExAcctFlow.html file path=usr/lib/help/auths/locale/C/SmfValueExAcctNet.html @@ -1143,6 +1152,7 @@ file path=usr/lib/help/auths/locale/C/ZoneLogin.html file path=usr/lib/help/auths/locale/C/ZoneManage.html file path=usr/lib/help/profiles/locale/C/RtAcctadm.html file path=usr/lib/help/profiles/locale/C/RtAll.html +file path=usr/lib/help/profiles/locale/C/RtAuditCfg.html file path=usr/lib/help/profiles/locale/C/RtAuditCtrl.html file path=usr/lib/help/profiles/locale/C/RtAuditReview.html file path=usr/lib/help/profiles/locale/C/RtCPUPowerManagement.html @@ -1249,6 +1259,7 @@ file path=usr/lib/localedef/extensions/single_byte.x mode=0444 file path=usr/lib/makekey mode=0555 file path=usr/lib/more.help file path=usr/lib/newsyslog group=sys mode=0555 +file path=usr/lib/passmgmt group=sys mode=0555 file path=usr/lib/pci/pcidr mode=0555 file path=usr/lib/pci/pcidr_plugin.so file path=usr/lib/pfexecd mode=0555 @@ -1399,7 +1410,6 @@ file path=usr/sbin/nlsadmin group=adm mode=0755 file path=usr/sbin/nscd mode=0555 file path=usr/sbin/nwamadm mode=0555 file path=usr/sbin/nwamcfg mode=0555 -file path=usr/sbin/passmgmt group=sys mode=0555 file path=usr/sbin/pmadm group=sys mode=0555 file path=usr/sbin/praudit mode=0555 $(i386_ONLY)file path=usr/sbin/prtdiag group=sys mode=2755 @@ -1434,8 +1444,8 @@ file path=usr/sbin/syncstat mode=0555 file path=usr/sbin/syseventadm group=sys mode=0555 file path=usr/sbin/syslogd group=sys mode=0555 file path=usr/sbin/tar mode=0555 -file path=usr/sbin/trapstat mode=0555 file path=usr/sbin/traceroute mode=4555 +file path=usr/sbin/trapstat mode=0555 file path=usr/sbin/ttyadm group=sys mode=0755 $(i386_ONLY)file path=usr/sbin/ucodeadm mode=0555 file path=usr/sbin/umountall group=sys mode=0555 @@ -1948,6 +1958,7 @@ file path=usr/share/lib/zoneinfo/PST8PDT file path=usr/share/lib/zoneinfo/Pacific/Apia file path=usr/share/lib/zoneinfo/Pacific/Auckland file path=usr/share/lib/zoneinfo/Pacific/Chatham +file path=usr/share/lib/zoneinfo/Pacific/Chuuk file path=usr/share/lib/zoneinfo/Pacific/Easter file path=usr/share/lib/zoneinfo/Pacific/Efate file path=usr/share/lib/zoneinfo/Pacific/Enderbury @@ -1973,14 +1984,13 @@ file path=usr/share/lib/zoneinfo/Pacific/Noumea file path=usr/share/lib/zoneinfo/Pacific/Pago_Pago file path=usr/share/lib/zoneinfo/Pacific/Palau file path=usr/share/lib/zoneinfo/Pacific/Pitcairn -file path=usr/share/lib/zoneinfo/Pacific/Ponape +file path=usr/share/lib/zoneinfo/Pacific/Pohnpei file path=usr/share/lib/zoneinfo/Pacific/Port_Moresby file path=usr/share/lib/zoneinfo/Pacific/Rarotonga file path=usr/share/lib/zoneinfo/Pacific/Saipan file path=usr/share/lib/zoneinfo/Pacific/Tahiti file path=usr/share/lib/zoneinfo/Pacific/Tarawa file path=usr/share/lib/zoneinfo/Pacific/Tongatapu -file path=usr/share/lib/zoneinfo/Pacific/Truk file path=usr/share/lib/zoneinfo/Pacific/Wake file path=usr/share/lib/zoneinfo/Pacific/Wallis file path=usr/share/lib/zoneinfo/WET @@ -2021,7 +2031,6 @@ 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 \ @@ -2477,10 +2486,14 @@ hardlink path=usr/share/lib/zoneinfo/Navajo \ target=../../../../usr/share/lib/zoneinfo/America/Denver hardlink path=usr/share/lib/zoneinfo/PRC \ target=../../../../usr/share/lib/zoneinfo/Asia/Shanghai +hardlink path=usr/share/lib/zoneinfo/Pacific/Ponape \ + target=../../../../../usr/share/lib/zoneinfo/Pacific/Pohnpei hardlink path=usr/share/lib/zoneinfo/Pacific/Samoa \ target=../../../../../usr/share/lib/zoneinfo/Pacific/Pago_Pago +hardlink path=usr/share/lib/zoneinfo/Pacific/Truk \ + target=../../../../../usr/share/lib/zoneinfo/Pacific/Chuuk hardlink path=usr/share/lib/zoneinfo/Pacific/Yap \ - target=../../../../../usr/share/lib/zoneinfo/Pacific/Truk + target=../../../../../usr/share/lib/zoneinfo/Pacific/Chuuk hardlink path=usr/share/lib/zoneinfo/Poland \ target=../../../../usr/share/lib/zoneinfo/Europe/Warsaw hardlink path=usr/share/lib/zoneinfo/Portugal \ @@ -2528,49 +2541,55 @@ 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 -legacy pkg=SUNWcsr arch=$(ARCH) category=system \ +legacy pkg=SUNWcsr \ desc="core software for a specific instruction-set architecture" \ - hotline="Please contact your local service provider" \ - name="Core Solaris, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWcsu arch=$(ARCH) category=system \ + name="Core Solaris, (Root)" +legacy pkg=SUNWcsu \ desc="core software for a specific instruction-set architecture" \ - hotline="Please contact your local service provider" \ - name="Core Solaris, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -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 -license ../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \ - license=../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE -license cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE -license cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE -license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp \ - license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp -license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route \ - license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route -license cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE -license cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE -license cmd/csh/THIRDPARTYLICENSE license=cmd/csh/THIRDPARTYLICENSE -license cmd/eeprom/THIRDPARTYLICENSE license=cmd/eeprom/THIRDPARTYLICENSE -license cmd/fs.d/ufs/THIRDPARTYLICENSE license=cmd/fs.d/ufs/THIRDPARTYLICENSE -license cmd/mt/THIRDPARTYLICENSE license=cmd/mt/THIRDPARTYLICENSE -license cmd/script/THIRDPARTYLICENSE license=cmd/script/THIRDPARTYLICENSE -license cmd/stat/vmstat/THIRDPARTYLICENSE \ - license=cmd/stat/vmstat/THIRDPARTYLICENSE -license cmd/tip/THIRDPARTYLICENSE license=cmd/tip/THIRDPARTYLICENSE -license cmd/tr/THIRDPARTYLICENSE license=cmd/tr/THIRDPARTYLICENSE -license cmd/vi/THIRDPARTYLICENSE license=cmd/vi/THIRDPARTYLICENSE -license cmd/which/THIRDPARTYLICENSE license=cmd/which/THIRDPARTYLICENSE -license cmd/xstr/THIRDPARTYLICENSE license=cmd/xstr/THIRDPARTYLICENSE + name="Core Solaris, (Usr)" +legacy pkg=SUNWftpr desc="FTP Server Configuration Files" \ + name="FTP Server, (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/sbin/ifparse/THIRDPARTYLICENSE +license usr/src/cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.lib/in.mpathd/THIRDPARTYLICENSE +license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp \ + license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.arp +license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route \ + license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.route +license usr/src/cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.sbin/ifconfig/THIRDPARTYLICENSE +license usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \ + license=usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE +license usr/src/cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.sbin/traceroute/THIRDPARTYLICENSE +license usr/src/cmd/cron/THIRDPARTYLICENSE \ + license=usr/src/cmd/cron/THIRDPARTYLICENSE +license usr/src/cmd/csh/THIRDPARTYLICENSE \ + license=usr/src/cmd/csh/THIRDPARTYLICENSE +license usr/src/cmd/eeprom/THIRDPARTYLICENSE \ + license=usr/src/cmd/eeprom/THIRDPARTYLICENSE +license usr/src/cmd/fs.d/ufs/THIRDPARTYLICENSE \ + license=usr/src/cmd/fs.d/ufs/THIRDPARTYLICENSE +license usr/src/cmd/mt/THIRDPARTYLICENSE \ + license=usr/src/cmd/mt/THIRDPARTYLICENSE +license usr/src/cmd/script/THIRDPARTYLICENSE \ + license=usr/src/cmd/script/THIRDPARTYLICENSE +license usr/src/cmd/stat/vmstat/THIRDPARTYLICENSE \ + license=usr/src/cmd/stat/vmstat/THIRDPARTYLICENSE +license usr/src/cmd/tip/THIRDPARTYLICENSE \ + license=usr/src/cmd/tip/THIRDPARTYLICENSE +license usr/src/cmd/tr/THIRDPARTYLICENSE \ + license=usr/src/cmd/tr/THIRDPARTYLICENSE +license usr/src/cmd/vi/THIRDPARTYLICENSE \ + license=usr/src/cmd/vi/THIRDPARTYLICENSE +license usr/src/cmd/which/THIRDPARTYLICENSE \ + license=usr/src/cmd/which/THIRDPARTYLICENSE +license usr/src/cmd/xstr/THIRDPARTYLICENSE \ + license=usr/src/cmd/xstr/THIRDPARTYLICENSE +license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE link path=bin target=./usr/bin link path=etc/TIMEZONE target=./default/init link path=etc/autopush target=../sbin/autopush @@ -2644,7 +2663,6 @@ link path=usr/bin/cachefspack target=../lib/fs/cachefs/cachefspack link path=usr/bin/cachefsstat target=../lib/fs/cachefs/cachefsstat link path=usr/bin/df target=../sbin/df link path=usr/bin/jsh target=ksh93 -link path=usr/bin/passmgmt target=../sbin/passmgmt link path=usr/bin/pwconv target=../sbin/pwconv link path=usr/bin/rmail target=./mail link path=usr/bin/sh target=$(ARCH32)/ksh93 diff --git a/usr/src/pkg/manifests/SUNWcsd.mf b/usr/src/pkg/manifests/SUNWcsd.mf index 8bac4cded4..d212434284 100644 --- a/usr/src/pkg/manifests/SUNWcsd.mf +++ b/usr/src/pkg/manifests/SUNWcsd.mf @@ -74,11 +74,9 @@ file path=etc/security/device_policy group=sys preserve=true file path=etc/security/extra_privs group=sys preserve=true 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 \ +legacy pkg=SUNWcsd \ desc="core entries for /dev and /devices needed for the initial boot of Solaris" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Devices" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Core Solaris Devices" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=dev/stderr target=./fd/2 diff --git a/usr/src/pkg/manifests/SUNWrmwb.mf b/usr/src/pkg/manifests/SUNWrmwb.mf index 75e73c6aab..c865a2acdc 100644 --- a/usr/src/pkg/manifests/SUNWrmwb.mf +++ b/usr/src/pkg/manifests/SUNWrmwb.mf @@ -28,4 +28,3 @@ set name=pkg.fmri value=pkg:/SUNWrmwb@$(PKGVERS) set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) - diff --git a/usr/src/pkg/manifests/audio-audio-utilities.mf b/usr/src/pkg/manifests/audio-audio-utilities.mf index 77e863a13d..c682266d93 100644 --- a/usr/src/pkg/manifests/audio-audio-utilities.mf +++ b/usr/src/pkg/manifests/audio-audio-utilities.mf @@ -35,10 +35,6 @@ 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" \ - hotline="Please contact your local service provider" \ - name="Audio Applications" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWauda desc="SunOS audio applications" name="Audio Applications" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/benchmark-filebench.mf b/usr/src/pkg/manifests/benchmark-filebench.mf index a44e914b19..9da01f679b 100644 --- a/usr/src/pkg/manifests/benchmark-filebench.mf +++ b/usr/src/pkg/manifests/benchmark-filebench.mf @@ -108,9 +108,8 @@ file path=usr/benchmarks/filebench/workloads/webproxy.f mode=0444 file path=usr/benchmarks/filebench/workloads/webserver.f mode=0444 hardlink path=usr/benchmarks/filebench/bin/go_filebench \ target=../../../../usr/lib/isaexec -legacy pkg=SUNWfilebench arch=$(ARCH) category=system \ +legacy pkg=SUNWfilebench \ desc="FileBench Commands, Workloads, Scripts, and Config Files" \ - hotline="Please contact your local service provider" name=FileBench \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name=FileBench license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/compatibility-ucb.mf b/usr/src/pkg/manifests/compatibility-ucb.mf index cc937abf1d..cf1c973cfd 100644 --- a/usr/src/pkg/manifests/compatibility-ucb.mf +++ b/usr/src/pkg/manifests/compatibility-ucb.mf @@ -87,40 +87,44 @@ file path=usr/ucblib/libucb.so.1 $(i386_ONLY)hardlink path=usr/ucb/$(ARCH32)/ps target=../../bin/$(ARCH32)/ps hardlink path=usr/ucb/$(ARCH64)/ps target=../../bin/$(ARCH64)/ps hardlink path=usr/ucb/ps target=../../usr/lib/isaexec -legacy pkg=SUNWscpr arch=$(ARCH) category=system \ +legacy pkg=SUNWscpr \ desc="utilities for user interface and source build compatibility with SunOS 4.x" \ - hotline="Please contact your local service provider" \ - name="Source Compatibility, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWscpu arch=$(ARCH) category=system \ + name="Source Compatibility, (Root)" +legacy pkg=SUNWscpu \ desc="utilities for user interface and source build compatibility with SunOS 4.x" \ - hotline="Please contact your local service provider" \ - name="Source Compatibility, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Source Compatibility, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -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/ln/THIRDPARTYLICENSE license=ucbcmd/ln/THIRDPARTYLICENSE -license ucbcmd/ls/THIRDPARTYLICENSE license=ucbcmd/ls/THIRDPARTYLICENSE -license ucbcmd/sum/THIRDPARTYLICENSE license=ucbcmd/sum/THIRDPARTYLICENSE -license ucbcmd/test/THIRDPARTYLICENSE license=ucbcmd/test/THIRDPARTYLICENSE -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 ucblib/libcurses/THIRDPARTYLICENSE \ - license=ucblib/libcurses/THIRDPARTYLICENSE -license ucblib/libtermcap/THIRDPARTYLICENSE \ - license=ucblib/libtermcap/THIRDPARTYLICENSE -license ucblib/libucb/THIRDPARTYLICENSE \ - license=ucblib/libucb/THIRDPARTYLICENSE +license usr/src/ucbcmd/basename/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/basename/THIRDPARTYLICENSE +license usr/src/ucbcmd/echo/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/echo/THIRDPARTYLICENSE +license usr/src/ucbcmd/from/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/from/THIRDPARTYLICENSE +license usr/src/ucbcmd/groups/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/groups/THIRDPARTYLICENSE +license usr/src/ucbcmd/ln/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/ln/THIRDPARTYLICENSE +license usr/src/ucbcmd/ls/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/ls/THIRDPARTYLICENSE +license usr/src/ucbcmd/sum/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/sum/THIRDPARTYLICENSE +license usr/src/ucbcmd/test/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/test/THIRDPARTYLICENSE +license usr/src/ucbcmd/tset/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/tset/THIRDPARTYLICENSE +license usr/src/ucbcmd/users/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/users/THIRDPARTYLICENSE +license usr/src/ucbcmd/whereis/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/whereis/THIRDPARTYLICENSE +license usr/src/ucbcmd/whoami/THIRDPARTYLICENSE \ + license=usr/src/ucbcmd/whoami/THIRDPARTYLICENSE +license usr/src/ucblib/libcurses/THIRDPARTYLICENSE \ + license=usr/src/ucblib/libcurses/THIRDPARTYLICENSE +license usr/src/ucblib/libtermcap/THIRDPARTYLICENSE \ + license=usr/src/ucblib/libtermcap/THIRDPARTYLICENSE +license usr/src/ucblib/libucb/THIRDPARTYLICENSE \ + license=usr/src/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 349801c0e0..d71b969f94 100644 --- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf +++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf @@ -72,9 +72,7 @@ dir path=usr/share/lib/locale/com/sun/dhcpmgr/data dir path=usr/share/lib/locale/com/sun/dhcpmgr/ui dir path=usr/share/lib/locale/com/sun/slp file path=usr/lib/help/auths/locale/AllSolAuthsHeader.html -file path=usr/lib/help/auths/locale/AuditConfig.html file path=usr/lib/help/auths/locale/AuditHeader.html -file path=usr/lib/help/auths/locale/AuditRead.html file path=usr/lib/help/auths/locale/AuthJobsAdmin.html file path=usr/lib/help/auths/locale/AuthJobsUser.html file path=usr/lib/help/auths/locale/AuthProfmgrAssign.html @@ -138,6 +136,7 @@ file path=usr/lib/help/auths/locale/PrintPs.html file path=usr/lib/help/auths/locale/PrintUnlabeled.html file path=usr/lib/help/auths/locale/ProfmgrHeader.html file path=usr/lib/help/auths/locale/RoleHeader.html +file path=usr/lib/help/auths/locale/SmfAllocate.html file path=usr/lib/help/auths/locale/SmfAutofsStates.html file path=usr/lib/help/auths/locale/SmfCoreadmStates.html file path=usr/lib/help/auths/locale/SmfCronStates.html @@ -152,6 +151,7 @@ file path=usr/lib/help/auths/locale/SmfIdmapStates.html file path=usr/lib/help/auths/locale/SmfInetdStates.html file path=usr/lib/help/auths/locale/SmfLocationStates.html file path=usr/lib/help/auths/locale/SmfMDNSStates.html +file path=usr/lib/help/auths/locale/SmfManageAudit.html file path=usr/lib/help/auths/locale/SmfManageHeader.html file path=usr/lib/help/auths/locale/SmfManageHotplug.html file path=usr/lib/help/auths/locale/SmfManageZFSSnap.html @@ -173,6 +173,7 @@ file path=usr/lib/help/auths/locale/SmfSendmailStates.html file path=usr/lib/help/auths/locale/SmfSshStates.html file path=usr/lib/help/auths/locale/SmfSyslogStates.html file path=usr/lib/help/auths/locale/SmfVRRPStates.html +file path=usr/lib/help/auths/locale/SmfValueAudit.html file path=usr/lib/help/auths/locale/SmfValueCoreadm.html file path=usr/lib/help/auths/locale/SmfValueExAcctFlow.html file path=usr/lib/help/auths/locale/SmfValueExAcctNet.html @@ -217,6 +218,7 @@ file path=usr/lib/help/auths/locale/ZoneLogin.html file path=usr/lib/help/auths/locale/ZoneManage.html file path=usr/lib/help/profiles/locale/RtAcctadm.html file path=usr/lib/help/profiles/locale/RtAll.html +file path=usr/lib/help/profiles/locale/RtAuditCfg.html file path=usr/lib/help/profiles/locale/RtAuditCtrl.html file path=usr/lib/help/profiles/locale/RtAuditReview.html file path=usr/lib/help/profiles/locale/RtCPUPowerManagement.html @@ -294,6 +296,7 @@ file path=usr/lib/help/profiles/locale/RtZoneSecurity.html file path=usr/lib/locale/C/LC_MESSAGES/AMD.po file path=usr/lib/locale/C/LC_MESSAGES/DISK.po file path=usr/lib/locale/C/LC_MESSAGES/FMD.po +file path=usr/lib/locale/C/LC_MESSAGES/FMNOTIFY.po file path=usr/lib/locale/C/LC_MESSAGES/GMCA.po file path=usr/lib/locale/C/LC_MESSAGES/INTEL.po file path=usr/lib/locale/C/LC_MESSAGES/NXGE.po @@ -303,6 +306,7 @@ file path=usr/lib/locale/C/LC_MESSAGES/SCA1000.po file path=usr/lib/locale/C/LC_MESSAGES/SCA500.po file path=usr/lib/locale/C/LC_MESSAGES/SCF.po file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.po +file path=usr/lib/locale/C/LC_MESSAGES/SMF.po file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.po file path=usr/lib/locale/C/LC_MESSAGES/SUN4.po file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.po @@ -442,10 +446,8 @@ file path=usr/share/lib/locale/com/sun/dhcpmgr/data/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 -legacy pkg=SUNW0on arch=all category=system \ +legacy pkg=SUNW0on arch=all \ desc="localizable message files for the OS-Networking consolidation" \ - hotline="Please contact your local service provider" \ - name="Localizable ON message files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.10 + name="Localizable ON message files" version=11.11,REV=2009.11.10 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/crypto-ca-certificates.mf b/usr/src/pkg/manifests/crypto-ca-certificates.mf index 081bba2f85..d77ed19e2e 100644 --- a/usr/src/pkg/manifests/crypto-ca-certificates.mf +++ b/usr/src/pkg/manifests/crypto-ca-certificates.mf @@ -24,8 +24,10 @@ # set name=pkg.fmri value=pkg:/crypto/ca-certificates@$(PKGVERS) -set name=pkg.description value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities" -set name=pkg.summary value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities" +set name=pkg.description \ + value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities" +set name=pkg.summary \ + value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities" set name=info.classification \ value=org.opensolaris.category.2010:System/Security set name=variant.arch value=$(ARCH) @@ -35,34 +37,35 @@ dir path=etc/certs group=sys dir path=etc/certs/CA group=sys dir path=etc/openssl group=sys dir path=etc/openssl/certs group=sys - file path=etc/certs/CA/ABAecom_sub.,_Am._Bankers_Assn._Root_CA.pem group=sys +file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem \ + group=sys +file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem \ + group=sys file path=etc/certs/CA/AddTrust_External_Root.pem group=sys file path=etc/certs/CA/AddTrust_Low-Value_Services_Root.pem group=sys file path=etc/certs/CA/AddTrust_Public_Services_Root.pem group=sys file path=etc/certs/CA/AddTrust_Qualified_Certificates_Root.pem group=sys -file path=etc/certs/CA/America_Online_Root_Certification_Authority_1.pem group=sys -file path=etc/certs/CA/America_Online_Root_Certification_Authority_2.pem group=sys -file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem group=sys -file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem group=sys +file path=etc/certs/CA/America_Online_Root_Certification_Authority_1.pem \ + group=sys +file path=etc/certs/CA/America_Online_Root_Certification_Authority_2.pem \ + group=sys file path=etc/certs/CA/Baltimore_CyberTrust_Root.pem group=sys -file path=etc/certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem group=sys -file path=etc/certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem group=sys -file path=etc/certs/CA/beTRUSTed_Root_CA.pem group=sys -file path=etc/certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem group=sys +file path=etc/certs/CA/COMODO_Certification_Authority.pem group=sys +file path=etc/certs/CA/COMODO_ECC_Certification_Authority.pem group=sys file path=etc/certs/CA/Camerfirma_Chambers_of_Commerce_Root.pem group=sys file path=etc/certs/CA/Camerfirma_Global_Chambersign_Root.pem group=sys file path=etc/certs/CA/Certigna.pem group=sys file path=etc/certs/CA/Certplus_Class_2_Primary_CA.pem group=sys file path=etc/certs/CA/Certum_Root_CA.pem group=sys +file path=etc/certs/CA/ComSign_CA.pem group=sys +file path=etc/certs/CA/ComSign_Secured_CA.pem group=sys file path=etc/certs/CA/Comodo_AAA_Services_root.pem group=sys -file path=etc/certs/CA/COMODO_Certification_Authority.pem group=sys -file path=etc/certs/CA/COMODO_ECC_Certification_Authority.pem group=sys file path=etc/certs/CA/Comodo_Secure_Services_root.pem group=sys file path=etc/certs/CA/Comodo_Trusted_Services_root.pem group=sys -file path=etc/certs/CA/ComSign_CA.pem group=sys -file path=etc/certs/CA/ComSign_Secured_CA.pem group=sys file path=etc/certs/CA/Cybertrust_Global_Root.pem group=sys +file path=etc/certs/CA/DST_ACES_CA_X6.pem group=sys +file path=etc/certs/CA/DST_Root_CA_X3.pem group=sys file path=etc/certs/CA/Deutsche_Telekom_Root_CA_2.pem group=sys file path=etc/certs/CA/DigiCert_Assured_ID_Root_CA.pem group=sys file path=etc/certs/CA/DigiCert_Global_Root_CA.pem group=sys @@ -72,36 +75,33 @@ file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_1.pem group=sys file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_2.pem group=sys file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_3.pem group=sys file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_4.pem group=sys -file path=etc/certs/CA/DST_ACES_CA_X6.pem group=sys -file path=etc/certs/CA/DST_Root_CA_X3.pem group=sys file path=etc/certs/CA/Entrust.net_Global_Secure_Personal_CA.pem group=sys file path=etc/certs/CA/Entrust.net_Global_Secure_Server_CA.pem group=sys file path=etc/certs/CA/Entrust.net_Premium_2048_Secure_Server_CA.pem group=sys file path=etc/certs/CA/Entrust.net_Secure_Personal_CA.pem group=sys file path=etc/certs/CA/Entrust.net_Secure_Server_CA.pem group=sys file path=etc/certs/CA/Entrust_Root_Certification_Authority.pem group=sys -file path=etc/certs/CA/ePKI_Root_Certification_Authority.pem group=sys file path=etc/certs/CA/Equifax_Secure_CA.pem group=sys +file path=etc/certs/CA/Equifax_Secure_Global_eBusiness_CA.pem group=sys file path=etc/certs/CA/Equifax_Secure_eBusiness_CA_1.pem group=sys file path=etc/certs/CA/Equifax_Secure_eBusiness_CA_2.pem group=sys -file path=etc/certs/CA/Equifax_Secure_Global_eBusiness_CA.pem group=sys file path=etc/certs/CA/Firmaprofesional_Root_CA.pem group=sys -file path=etc/certs/CA/GeoTrust_Global_CA_2.pem group=sys +file path=etc/certs/CA/GTE_CyberTrust_Global_Root.pem group=sys +file path=etc/certs/CA/GTE_CyberTrust_Root_CA.pem group=sys file path=etc/certs/CA/GeoTrust_Global_CA.pem group=sys +file path=etc/certs/CA/GeoTrust_Global_CA_2.pem group=sys file path=etc/certs/CA/GeoTrust_Primary_Certification_Authority.pem group=sys -file path=etc/certs/CA/GeoTrust_Universal_CA_2.pem group=sys file path=etc/certs/CA/GeoTrust_Universal_CA.pem group=sys +file path=etc/certs/CA/GeoTrust_Universal_CA_2.pem group=sys file path=etc/certs/CA/GlobalSign_Root_CA.pem group=sys file path=etc/certs/CA/GlobalSign_Root_CA_-_R2.pem group=sys file path=etc/certs/CA/Go_Daddy_Class_2_CA.pem group=sys -file path=etc/certs/CA/GTE_CyberTrust_Global_Root.pem group=sys -file path=etc/certs/CA/GTE_CyberTrust_Root_CA.pem group=sys file path=etc/certs/CA/IGC_A.pem group=sys -file path=etc/certs/CA/IPS_Chained_CAs_root.pem group=sys file path=etc/certs/CA/IPS_CLASE1_root.pem group=sys file path=etc/certs/CA/IPS_CLASE3_root.pem group=sys file path=etc/certs/CA/IPS_CLASEA1_root.pem group=sys file path=etc/certs/CA/IPS_CLASEA3_root.pem group=sys +file path=etc/certs/CA/IPS_Chained_CAs_root.pem group=sys file path=etc/certs/CA/IPS_Servidores_root.pem group=sys file path=etc/certs/CA/IPS_Timestamping_root.pem group=sys file path=etc/certs/CA/MD5_Collisions_Forged_Rogue_CA_25c3.pem group=sys @@ -112,14 +112,17 @@ file path=etc/certs/CA/NetLock_Notary_Class_A_Root.pem group=sys file path=etc/certs/CA/NetLock_Qualified_Class_QA_Root.pem group=sys file path=etc/certs/CA/Network_Solutions_Certificate_Authority.pem group=sys file path=etc/certs/CA/OISTE_WISeKey_Global_Root_GA_CA.pem group=sys +file path=etc/certs/CA/QuoVadis_Root_CA.pem group=sys file path=etc/certs/CA/QuoVadis_Root_CA_2.pem group=sys file path=etc/certs/CA/QuoVadis_Root_CA_3.pem group=sys -file path=etc/certs/CA/QuoVadis_Root_CA.pem group=sys file path=etc/certs/CA/RSA_Root_Certificate_1.pem group=sys file path=etc/certs/CA/RSA_Security_1024_v3.pem group=sys file path=etc/certs/CA/RSA_Security_2048_v3.pem group=sys -file path=etc/certs/CA/Secure_Global_CA.pem group=sys +file \ + path=etc/certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem \ + group=sys file path=etc/certs/CA/SecureTrust_CA.pem group=sys +file path=etc/certs/CA/Secure_Global_CA.pem group=sys file path=etc/certs/CA/Security_Communication_EV_RootCA1.pem group=sys file path=etc/certs/CA/Security_Communication_Root_CA.pem group=sys file path=etc/certs/CA/Sonera_Class_1_Root_CA.pem group=sys @@ -128,195 +131,361 @@ file path=etc/certs/CA/Staat_der_Nederlanden_Root_CA.pem group=sys file path=etc/certs/CA/Starfield_Class_2_CA.pem group=sys file path=etc/certs/CA/StartCom_Certification_Authority.pem group=sys file path=etc/certs/CA/StartCom_Ltd..pem group=sys -file path=etc/certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem group=sys -file path=etc/certs/CA/Swisscom_Root_CA_1.pem group=sys file path=etc/certs/CA/SwissSign_Gold_CA_-_G2.pem group=sys file path=etc/certs/CA/SwissSign_Platinum_CA_-_G2.pem group=sys file path=etc/certs/CA/SwissSign_Silver_CA_-_G2.pem group=sys -file path=etc/certs/CA/Taiwan_GRCA.pem group=sys -file path=etc/certs/CA/TC_TrustCenter_Class_2_CA_II.pem group=sys -file path=etc/certs/CA/TC_TrustCenter_Class_3_CA_II.pem group=sys +file path=etc/certs/CA/Swisscom_Root_CA_1.pem group=sys file path=etc/certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem group=sys file path=etc/certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem group=sys +file path=etc/certs/CA/TC_TrustCenter_Class_2_CA_II.pem group=sys +file path=etc/certs/CA/TC_TrustCenter_Class_3_CA_II.pem group=sys file path=etc/certs/CA/TC_TrustCenter_Universal_CA_I.pem group=sys file path=etc/certs/CA/TDC_Internet_Root_CA.pem group=sys file path=etc/certs/CA/TDC_OCES_Root_CA.pem group=sys +file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem \ + group=sys +file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem \ + group=sys +file path=etc/certs/CA/Taiwan_GRCA.pem group=sys file path=etc/certs/CA/Thawte_Personal_Basic_CA.pem group=sys file path=etc/certs/CA/Thawte_Personal_Freemail_CA.pem group=sys file path=etc/certs/CA/Thawte_Personal_Premium_CA.pem group=sys file path=etc/certs/CA/Thawte_Premium_Server_CA.pem group=sys -file path=etc/certs/CA/thawte_Primary_Root_CA.pem group=sys file path=etc/certs/CA/Thawte_Server_CA.pem group=sys file path=etc/certs/CA/Thawte_Time_Stamping_CA.pem group=sys -file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem group=sys -file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem group=sys +file path=etc/certs/CA/UTN-USER_First-Network_Applications.pem group=sys file path=etc/certs/CA/UTN_DATACorp_SGC_Root_CA.pem group=sys file path=etc/certs/CA/UTN_USERFirst_Email_Root_CA.pem group=sys file path=etc/certs/CA/UTN_USERFirst_Hardware_Root_CA.pem group=sys -file path=etc/certs/CA/UTN-USER_First-Network_Applications.pem group=sys file path=etc/certs/CA/UTN_USERFirst_Object_Root_CA.pem group=sys file path=etc/certs/CA/ValiCert_Class_1_VA.pem group=sys file path=etc/certs/CA/ValiCert_Class_2_VA.pem group=sys -file path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem group=sys -file path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem group=sys -file path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem group=sys -file path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem group=sys -file path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem group=sys -file path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem group=sys -file path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem group=sys -file path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem group=sys -file path=etc/certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem group=sys -file path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem group=sys -file path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem group=sys -file path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem group=sys +file \ + path=etc/certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem \ + group=sys +file \ + path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem \ + group=sys file path=etc/certs/CA/Verisign_RSA_Secure_Server_CA.pem group=sys file path=etc/certs/CA/Verisign_Time_Stamping_Authority_CA.pem group=sys -file path=etc/certs/CA/Visa_eCommerce_Root.pem group=sys file path=etc/certs/CA/Visa_International_Global_Root_2.pem group=sys +file path=etc/certs/CA/Visa_eCommerce_Root.pem group=sys +file path=etc/certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem \ + group=sys file path=etc/certs/CA/Wells_Fargo_Root_CA.pem group=sys -file path=etc/certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem group=sys file path=etc/certs/CA/XRamp_Global_CA_Root.pem group=sys - -link path=etc/openssl/certs/c9bc75ba.0 target=../../certs/CA/ABAecom_sub.,_Am._Bankers_Assn._Root_CA.pem -link path=etc/openssl/certs/3c58f906.0 target=../../certs/CA/AddTrust_External_Root.pem -link path=etc/openssl/certs/e268a4c5.0 target=../../certs/CA/AddTrust_Low-Value_Services_Root.pem -link path=etc/openssl/certs/a2df7ad7.0 target=../../certs/CA/AddTrust_Public_Services_Root.pem -link path=etc/openssl/certs/052e396b.0 target=../../certs/CA/AddTrust_Qualified_Certificates_Root.pem -link path=etc/openssl/certs/bda4cc84.0 target=../../certs/CA/America_Online_Root_Certification_Authority_1.pem -link path=etc/openssl/certs/2fb1850a.0 target=../../certs/CA/America_Online_Root_Certification_Authority_2.pem -link path=etc/openssl/certs/0dbd0096.0 target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem -link path=etc/openssl/certs/0481cb65.0 target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem -link path=etc/openssl/certs/3ad48a91.0 target=../../certs/CA/Baltimore_CyberTrust_Root.pem -link path=etc/openssl/certs/f3cf1e8e.0 target=../../certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem -link path=etc/openssl/certs/47996b5c.0 target=../../certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem -link path=etc/openssl/certs/31044350.0 target=../../certs/CA/beTRUSTed_Root_CA.pem -link path=etc/openssl/certs/bf87590f.0 target=../../certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem -link path=etc/openssl/certs/ee7cd6fb.0 target=../../certs/CA/Camerfirma_Chambers_of_Commerce_Root.pem -link path=etc/openssl/certs/a0bc6fbb.0 target=../../certs/CA/Camerfirma_Global_Chambersign_Root.pem -link path=etc/openssl/certs/fde84897.0 target=../../certs/CA/Certigna.pem -link path=etc/openssl/certs/17b51fe6.0 target=../../certs/CA/Certplus_Class_2_Primary_CA.pem -link path=etc/openssl/certs/6e8bf996.0 target=../../certs/CA/Certum_Root_CA.pem -link path=etc/openssl/certs/75680d2e.0 target=../../certs/CA/Comodo_AAA_Services_root.pem -link path=etc/openssl/certs/5a3f0ff8.0 target=../../certs/CA/COMODO_Certification_Authority.pem -link path=etc/openssl/certs/89c02a45.0 target=../../certs/CA/COMODO_ECC_Certification_Authority.pem -link path=etc/openssl/certs/02b73561.0 target=../../certs/CA/Comodo_Secure_Services_root.pem -link path=etc/openssl/certs/124bbd54.0 target=../../certs/CA/Comodo_Trusted_Services_root.pem -link path=etc/openssl/certs/ff588423.0 target=../../certs/CA/ComSign_CA.pem -link path=etc/openssl/certs/f58a60fe.0 target=../../certs/CA/ComSign_Secured_CA.pem -link path=etc/openssl/certs/343eb6cb.0 target=../../certs/CA/Cybertrust_Global_Root.pem -link path=etc/openssl/certs/4e18c148.0 target=../../certs/CA/Deutsche_Telekom_Root_CA_2.pem -link path=etc/openssl/certs/69105f4f.0 target=../../certs/CA/DigiCert_Assured_ID_Root_CA.pem -link path=etc/openssl/certs/399e7759.0 target=../../certs/CA/DigiCert_Global_Root_CA.pem -link path=etc/openssl/certs/81b9768f.0 target=../../certs/CA/DigiCert_High_Assurance_EV_Root_CA.pem -link path=etc/openssl/certs/c0cafbd2.0 target=../../certs/CA/DigiNotar_Root_CA.pem -link path=etc/openssl/certs/c215bc69.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_1.pem -link path=etc/openssl/certs/128b9c8d.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_2.pem -link path=etc/openssl/certs/a15b3b6b.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_3.pem -link path=etc/openssl/certs/4643210f.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_4.pem -link path=etc/openssl/certs/1dac3003.0 target=../../certs/CA/DST_ACES_CA_X6.pem -link path=etc/openssl/certs/12d55845.0 target=../../certs/CA/DST_Root_CA_X3.pem -link path=etc/openssl/certs/d2adc77d.0 target=../../certs/CA/Entrust.net_Global_Secure_Personal_CA.pem -link path=etc/openssl/certs/19899da5.0 target=../../certs/CA/Entrust.net_Global_Secure_Server_CA.pem -link path=etc/openssl/certs/3e7271e8.0 target=../../certs/CA/Entrust.net_Premium_2048_Secure_Server_CA.pem -link path=etc/openssl/certs/0c364b2d.0 target=../../certs/CA/Entrust.net_Secure_Personal_CA.pem -link path=etc/openssl/certs/ed524cf5.0 target=../../certs/CA/Entrust.net_Secure_Server_CA.pem -link path=etc/openssl/certs/bf64f35b.0 target=../../certs/CA/Entrust_Root_Certification_Authority.pem -link path=etc/openssl/certs/9d6523ce.0 target=../../certs/CA/ePKI_Root_Certification_Authority.pem -link path=etc/openssl/certs/594f1775.0 target=../../certs/CA/Equifax_Secure_CA.pem -link path=etc/openssl/certs/e7b8d656.0 target=../../certs/CA/Equifax_Secure_eBusiness_CA_1.pem -link path=etc/openssl/certs/8f7b96c4.0 target=../../certs/CA/Equifax_Secure_eBusiness_CA_2.pem -link path=etc/openssl/certs/74c26bd0.0 target=../../certs/CA/Equifax_Secure_Global_eBusiness_CA.pem -link path=etc/openssl/certs/1155c94b.0 target=../../certs/CA/Firmaprofesional_Root_CA.pem -link path=etc/openssl/certs/57692373.0 target=../../certs/CA/GeoTrust_Global_CA_2.pem -link path=etc/openssl/certs/7999be0d.0 target=../../certs/CA/GeoTrust_Global_CA.pem -link path=etc/openssl/certs/9772ca32.0 target=../../certs/CA/GeoTrust_Primary_Certification_Authority.pem -link path=etc/openssl/certs/87753b0d.0 target=../../certs/CA/GeoTrust_Universal_CA_2.pem -link path=etc/openssl/certs/e775ed2d.0 target=../../certs/CA/GeoTrust_Universal_CA.pem -link path=etc/openssl/certs/b0f3e76e.0 target=../../certs/CA/GlobalSign_Root_CA.pem -link path=etc/openssl/certs/111e6273.0 target=../../certs/CA/GlobalSign_Root_CA_-_R2.pem -link path=etc/openssl/certs/219d9499.0 target=../../certs/CA/Go_Daddy_Class_2_CA.pem -link path=etc/openssl/certs/4d654d1d.0 target=../../certs/CA/GTE_CyberTrust_Global_Root.pem -link path=etc/openssl/certs/97b4211c.0 target=../../certs/CA/GTE_CyberTrust_Root_CA.pem -link path=etc/openssl/certs/58a44af1.0 target=../../certs/CA/IGC_A.pem -link path=etc/openssl/certs/a6776c69.0 target=../../certs/CA/IPS_Chained_CAs_root.pem -link path=etc/openssl/certs/f950ccc2.0 target=../../certs/CA/IPS_CLASE1_root.pem -link path=etc/openssl/certs/86f32474.0 target=../../certs/CA/IPS_CLASE3_root.pem -link path=etc/openssl/certs/8fe643df.0 target=../../certs/CA/IPS_CLASEA1_root.pem -link path=etc/openssl/certs/72bf6a04.0 target=../../certs/CA/IPS_CLASEA3_root.pem -link path=etc/openssl/certs/f64d9715.0 target=../../certs/CA/IPS_Servidores_root.pem -link path=etc/openssl/certs/4184de39.0 target=../../certs/CA/IPS_Timestamping_root.pem -link path=etc/openssl/certs/e7461595.0 target=../../certs/CA/MD5_Collisions_Forged_Rogue_CA_25c3.pem -link path=etc/openssl/certs/f61bff45.0 target=../../certs/CA/Microsec_e-Szigno_Root_CA.pem -link path=etc/openssl/certs/5a5372fc.0 target=../../certs/CA/NetLock_Business_Class_B_Root.pem -link path=etc/openssl/certs/635ccfd5.0 target=../../certs/CA/NetLock_Express_Class_C_Root.pem -link path=etc/openssl/certs/add67345.0 target=../../certs/CA/NetLock_Notary_Class_A_Root.pem -link path=etc/openssl/certs/8317b10c.0 target=../../certs/CA/NetLock_Qualified_Class_QA_Root.pem -link path=etc/openssl/certs/2fa87019.0 target=../../certs/CA/Network_Solutions_Certificate_Authority.pem -link path=etc/openssl/certs/3a3b02ce.0 target=../../certs/CA/OISTE_WISeKey_Global_Root_GA_CA.pem -link path=etc/openssl/certs/7a819ef2.0 target=../../certs/CA/QuoVadis_Root_CA_2.pem -link path=etc/openssl/certs/9339512a.0 target=../../certs/CA/QuoVadis_Root_CA_3.pem -link path=etc/openssl/certs/5cf9d536.0 target=../../certs/CA/QuoVadis_Root_CA.pem -link path=etc/openssl/certs/7d3cd826.0 target=../../certs/CA/RSA_Root_Certificate_1.pem -link path=etc/openssl/certs/4166ec0c.0 target=../../certs/CA/RSA_Security_1024_v3.pem -link path=etc/openssl/certs/8470719d.0 target=../../certs/CA/RSA_Security_2048_v3.pem -link path=etc/openssl/certs/bdacca6f.0 target=../../certs/CA/Secure_Global_CA.pem -link path=etc/openssl/certs/cf701eeb.0 target=../../certs/CA/SecureTrust_CA.pem -link path=etc/openssl/certs/9dbefe7b.0 target=../../certs/CA/Security_Communication_EV_RootCA1.pem -link path=etc/openssl/certs/a3896b44.0 target=../../certs/CA/Security_Communication_Root_CA.pem -link path=etc/openssl/certs/755f7420.0 target=../../certs/CA/Sonera_Class_1_Root_CA.pem -link path=etc/openssl/certs/a7605362.0 target=../../certs/CA/Sonera_Class_2_Root_CA.pem -link path=etc/openssl/certs/cdaebb72.0 target=../../certs/CA/Staat_der_Nederlanden_Root_CA.pem -link path=etc/openssl/certs/23f4c490.0 target=../../certs/CA/Starfield_Class_2_CA.pem -link path=etc/openssl/certs/33815e15.0 target=../../certs/CA/StartCom_Certification_Authority.pem -link path=etc/openssl/certs/cb796bc1.0 target=../../certs/CA/StartCom_Ltd..pem -link path=etc/openssl/certs/f559733c.0 target=../../certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem -link path=etc/openssl/certs/e60bf0c0.0 target=../../certs/CA/Swisscom_Root_CA_1.pem -link path=etc/openssl/certs/3c860d51.0 target=../../certs/CA/SwissSign_Gold_CA_-_G2.pem -link path=etc/openssl/certs/46b2fd3b.0 target=../../certs/CA/SwissSign_Platinum_CA_-_G2.pem -link path=etc/openssl/certs/5046c355.0 target=../../certs/CA/SwissSign_Silver_CA_-_G2.pem -link path=etc/openssl/certs/1dcd6f4c.0 target=../../certs/CA/Taiwan_GRCA.pem -link path=etc/openssl/certs/2afc57aa.0 target=../../certs/CA/TC_TrustCenter_Class_2_CA_II.pem -link path=etc/openssl/certs/7a481e66.0 target=../../certs/CA/TC_TrustCenter_Class_3_CA_II.pem -link path=etc/openssl/certs/256fd83b.0 target=../../certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem -link path=etc/openssl/certs/54edfa5d.0 target=../../certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem -link path=etc/openssl/certs/5021a0a2.0 target=../../certs/CA/TC_TrustCenter_Universal_CA_I.pem -link path=etc/openssl/certs/d537fba6.0 target=../../certs/CA/TDC_Internet_Root_CA.pem -link path=etc/openssl/certs/11a09b38.0 target=../../certs/CA/TDC_OCES_Root_CA.pem -link path=etc/openssl/certs/0e82f83a.0 target=../../certs/CA/Thawte_Personal_Basic_CA.pem -link path=etc/openssl/certs/709afd2b.0 target=../../certs/CA/Thawte_Personal_Freemail_CA.pem -link path=etc/openssl/certs/412bea73.0 target=../../certs/CA/Thawte_Personal_Premium_CA.pem -link path=etc/openssl/certs/c33a80d4.0 target=../../certs/CA/Thawte_Premium_Server_CA.pem -link path=etc/openssl/certs/00673b5b.0 target=../../certs/CA/thawte_Primary_Root_CA.pem -link path=etc/openssl/certs/ddc328ff.0 target=../../certs/CA/Thawte_Server_CA.pem -link path=etc/openssl/certs/aaa45464.0 target=../../certs/CA/Thawte_Time_Stamping_CA.pem -link path=etc/openssl/certs/84cba82f.0 target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem -link path=etc/openssl/certs/56b8a0b6.0 target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem -link path=etc/openssl/certs/4fbd6bfa.0 target=../../certs/CA/UTN_DATACorp_SGC_Root_CA.pem -link path=etc/openssl/certs/9ec3a561.0 target=../../certs/CA/UTN_USERFirst_Email_Root_CA.pem -link path=etc/openssl/certs/ff783690.0 target=../../certs/CA/UTN_USERFirst_Hardware_Root_CA.pem -link path=etc/openssl/certs/d8274e24.0 target=../../certs/CA/UTN-USER_First-Network_Applications.pem -link path=etc/openssl/certs/ccb919f9.0 target=../../certs/CA/UTN_USERFirst_Object_Root_CA.pem -link path=etc/openssl/certs/f4996e82.0 target=../../certs/CA/ValiCert_Class_1_VA.pem -link path=etc/openssl/certs/bcdd5959.0 target=../../certs/CA/ValiCert_Class_2_VA.pem -link path=etc/openssl/certs/c19d42c7.0 target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem -link path=etc/openssl/certs/11f154d6.0 target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem -link path=etc/openssl/certs/2edf7016.0 target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem -link path=etc/openssl/certs/ed62f4e3.0 target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem -link path=etc/openssl/certs/d78a75c7.0 target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem -link path=etc/openssl/certs/b5f329fa.0 target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem -link path=etc/openssl/certs/72fa7371.0 target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem -link path=etc/openssl/certs/7d453d8f.0 target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem -link path=etc/openssl/certs/facacbc6.0 target=../../certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem -link path=etc/openssl/certs/7651b327.0 target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem -link path=etc/openssl/certs/ed049835.0 target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem -link path=etc/openssl/certs/c527e4ab.0 target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem -link path=etc/openssl/certs/f73e89fd.0 target=../../certs/CA/Verisign_RSA_Secure_Server_CA.pem -link path=etc/openssl/certs/95750816.0 target=../../certs/CA/Verisign_Time_Stamping_Authority_CA.pem -link path=etc/openssl/certs/6fcc125d.0 target=../../certs/CA/Visa_eCommerce_Root.pem -link path=etc/openssl/certs/788c9bfc.0 target=../../certs/CA/Visa_International_Global_Root_2.pem -link path=etc/openssl/certs/6adf0799.0 target=../../certs/CA/Wells_Fargo_Root_CA.pem -link path=etc/openssl/certs/08aef7bb.0 target=../../certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem -link path=etc/openssl/certs/76579174.0 target=../../certs/CA/XRamp_Global_CA_Root.pem - +file path=etc/certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem \ + group=sys +file path=etc/certs/CA/beTRUSTed_Root_CA.pem group=sys +file path=etc/certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem \ + group=sys +file path=etc/certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem group=sys +file path=etc/certs/CA/ePKI_Root_Certification_Authority.pem group=sys +file path=etc/certs/CA/thawte_Primary_Root_CA.pem group=sys license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +link path=etc/openssl/certs/00673b5b.0 \ + target=../../certs/CA/thawte_Primary_Root_CA.pem +link path=etc/openssl/certs/02b73561.0 \ + target=../../certs/CA/Comodo_Secure_Services_root.pem +link path=etc/openssl/certs/0481cb65.0 \ + target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem +link path=etc/openssl/certs/052e396b.0 \ + target=../../certs/CA/AddTrust_Qualified_Certificates_Root.pem +link path=etc/openssl/certs/08aef7bb.0 \ + target=../../certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem +link path=etc/openssl/certs/0c364b2d.0 \ + target=../../certs/CA/Entrust.net_Secure_Personal_CA.pem +link path=etc/openssl/certs/0dbd0096.0 \ + target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem +link path=etc/openssl/certs/0e82f83a.0 \ + target=../../certs/CA/Thawte_Personal_Basic_CA.pem +link path=etc/openssl/certs/111e6273.0 \ + target=../../certs/CA/GlobalSign_Root_CA_-_R2.pem +link path=etc/openssl/certs/1155c94b.0 \ + target=../../certs/CA/Firmaprofesional_Root_CA.pem +link path=etc/openssl/certs/11a09b38.0 \ + target=../../certs/CA/TDC_OCES_Root_CA.pem +link path=etc/openssl/certs/11f154d6.0 \ + target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem +link path=etc/openssl/certs/124bbd54.0 \ + target=../../certs/CA/Comodo_Trusted_Services_root.pem +link path=etc/openssl/certs/128b9c8d.0 \ + target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_2.pem +link path=etc/openssl/certs/12d55845.0 \ + target=../../certs/CA/DST_Root_CA_X3.pem +link path=etc/openssl/certs/17b51fe6.0 \ + target=../../certs/CA/Certplus_Class_2_Primary_CA.pem +link path=etc/openssl/certs/19899da5.0 \ + target=../../certs/CA/Entrust.net_Global_Secure_Server_CA.pem +link path=etc/openssl/certs/1dac3003.0 \ + target=../../certs/CA/DST_ACES_CA_X6.pem +link path=etc/openssl/certs/1dcd6f4c.0 target=../../certs/CA/Taiwan_GRCA.pem +link path=etc/openssl/certs/219d9499.0 \ + target=../../certs/CA/Go_Daddy_Class_2_CA.pem +link path=etc/openssl/certs/23f4c490.0 \ + target=../../certs/CA/Starfield_Class_2_CA.pem +link path=etc/openssl/certs/256fd83b.0 \ + target=../../certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem +link path=etc/openssl/certs/2afc57aa.0 \ + target=../../certs/CA/TC_TrustCenter_Class_2_CA_II.pem +link path=etc/openssl/certs/2edf7016.0 \ + target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem +link path=etc/openssl/certs/2fa87019.0 \ + target=../../certs/CA/Network_Solutions_Certificate_Authority.pem +link path=etc/openssl/certs/2fb1850a.0 \ + target=../../certs/CA/America_Online_Root_Certification_Authority_2.pem +link path=etc/openssl/certs/31044350.0 \ + target=../../certs/CA/beTRUSTed_Root_CA.pem +link path=etc/openssl/certs/33815e15.0 \ + target=../../certs/CA/StartCom_Certification_Authority.pem +link path=etc/openssl/certs/343eb6cb.0 \ + target=../../certs/CA/Cybertrust_Global_Root.pem +link path=etc/openssl/certs/399e7759.0 \ + target=../../certs/CA/DigiCert_Global_Root_CA.pem +link path=etc/openssl/certs/3a3b02ce.0 \ + target=../../certs/CA/OISTE_WISeKey_Global_Root_GA_CA.pem +link path=etc/openssl/certs/3ad48a91.0 \ + target=../../certs/CA/Baltimore_CyberTrust_Root.pem +link path=etc/openssl/certs/3c58f906.0 \ + target=../../certs/CA/AddTrust_External_Root.pem +link path=etc/openssl/certs/3c860d51.0 \ + target=../../certs/CA/SwissSign_Gold_CA_-_G2.pem +link path=etc/openssl/certs/3e7271e8.0 \ + target=../../certs/CA/Entrust.net_Premium_2048_Secure_Server_CA.pem +link path=etc/openssl/certs/412bea73.0 \ + target=../../certs/CA/Thawte_Personal_Premium_CA.pem +link path=etc/openssl/certs/4166ec0c.0 \ + target=../../certs/CA/RSA_Security_1024_v3.pem +link path=etc/openssl/certs/4184de39.0 \ + target=../../certs/CA/IPS_Timestamping_root.pem +link path=etc/openssl/certs/4643210f.0 \ + target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_4.pem +link path=etc/openssl/certs/46b2fd3b.0 \ + target=../../certs/CA/SwissSign_Platinum_CA_-_G2.pem +link path=etc/openssl/certs/47996b5c.0 \ + target=../../certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem +link path=etc/openssl/certs/4d654d1d.0 \ + target=../../certs/CA/GTE_CyberTrust_Global_Root.pem +link path=etc/openssl/certs/4e18c148.0 \ + target=../../certs/CA/Deutsche_Telekom_Root_CA_2.pem +link path=etc/openssl/certs/4fbd6bfa.0 \ + target=../../certs/CA/UTN_DATACorp_SGC_Root_CA.pem +link path=etc/openssl/certs/5021a0a2.0 \ + target=../../certs/CA/TC_TrustCenter_Universal_CA_I.pem +link path=etc/openssl/certs/5046c355.0 \ + target=../../certs/CA/SwissSign_Silver_CA_-_G2.pem +link path=etc/openssl/certs/54edfa5d.0 \ + target=../../certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem +link path=etc/openssl/certs/56b8a0b6.0 \ + target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem +link path=etc/openssl/certs/57692373.0 \ + target=../../certs/CA/GeoTrust_Global_CA_2.pem +link path=etc/openssl/certs/58a44af1.0 target=../../certs/CA/IGC_A.pem +link path=etc/openssl/certs/594f1775.0 \ + target=../../certs/CA/Equifax_Secure_CA.pem +link path=etc/openssl/certs/5a3f0ff8.0 \ + target=../../certs/CA/COMODO_Certification_Authority.pem +link path=etc/openssl/certs/5a5372fc.0 \ + target=../../certs/CA/NetLock_Business_Class_B_Root.pem +link path=etc/openssl/certs/5cf9d536.0 \ + target=../../certs/CA/QuoVadis_Root_CA.pem +link path=etc/openssl/certs/635ccfd5.0 \ + target=../../certs/CA/NetLock_Express_Class_C_Root.pem +link path=etc/openssl/certs/69105f4f.0 \ + target=../../certs/CA/DigiCert_Assured_ID_Root_CA.pem +link path=etc/openssl/certs/6adf0799.0 \ + target=../../certs/CA/Wells_Fargo_Root_CA.pem +link path=etc/openssl/certs/6e8bf996.0 \ + target=../../certs/CA/Certum_Root_CA.pem +link path=etc/openssl/certs/6fcc125d.0 \ + target=../../certs/CA/Visa_eCommerce_Root.pem +link path=etc/openssl/certs/709afd2b.0 \ + target=../../certs/CA/Thawte_Personal_Freemail_CA.pem +link path=etc/openssl/certs/72bf6a04.0 \ + target=../../certs/CA/IPS_CLASEA3_root.pem +link path=etc/openssl/certs/72fa7371.0 \ + target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem +link path=etc/openssl/certs/74c26bd0.0 \ + target=../../certs/CA/Equifax_Secure_Global_eBusiness_CA.pem +link path=etc/openssl/certs/755f7420.0 \ + target=../../certs/CA/Sonera_Class_1_Root_CA.pem +link path=etc/openssl/certs/75680d2e.0 \ + target=../../certs/CA/Comodo_AAA_Services_root.pem +link path=etc/openssl/certs/7651b327.0 \ + target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem +link path=etc/openssl/certs/76579174.0 \ + target=../../certs/CA/XRamp_Global_CA_Root.pem +link path=etc/openssl/certs/788c9bfc.0 \ + target=../../certs/CA/Visa_International_Global_Root_2.pem +link path=etc/openssl/certs/7999be0d.0 \ + target=../../certs/CA/GeoTrust_Global_CA.pem +link path=etc/openssl/certs/7a481e66.0 \ + target=../../certs/CA/TC_TrustCenter_Class_3_CA_II.pem +link path=etc/openssl/certs/7a819ef2.0 \ + target=../../certs/CA/QuoVadis_Root_CA_2.pem +link path=etc/openssl/certs/7d3cd826.0 \ + target=../../certs/CA/RSA_Root_Certificate_1.pem +link path=etc/openssl/certs/7d453d8f.0 \ + target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem +link path=etc/openssl/certs/81b9768f.0 \ + target=../../certs/CA/DigiCert_High_Assurance_EV_Root_CA.pem +link path=etc/openssl/certs/8317b10c.0 \ + target=../../certs/CA/NetLock_Qualified_Class_QA_Root.pem +link path=etc/openssl/certs/8470719d.0 \ + target=../../certs/CA/RSA_Security_2048_v3.pem +link path=etc/openssl/certs/84cba82f.0 \ + target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem +link path=etc/openssl/certs/86f32474.0 \ + target=../../certs/CA/IPS_CLASE3_root.pem +link path=etc/openssl/certs/87753b0d.0 \ + target=../../certs/CA/GeoTrust_Universal_CA_2.pem +link path=etc/openssl/certs/89c02a45.0 \ + target=../../certs/CA/COMODO_ECC_Certification_Authority.pem +link path=etc/openssl/certs/8f7b96c4.0 \ + target=../../certs/CA/Equifax_Secure_eBusiness_CA_2.pem +link path=etc/openssl/certs/8fe643df.0 \ + target=../../certs/CA/IPS_CLASEA1_root.pem +link path=etc/openssl/certs/9339512a.0 \ + target=../../certs/CA/QuoVadis_Root_CA_3.pem +link path=etc/openssl/certs/95750816.0 \ + target=../../certs/CA/Verisign_Time_Stamping_Authority_CA.pem +link path=etc/openssl/certs/9772ca32.0 \ + target=../../certs/CA/GeoTrust_Primary_Certification_Authority.pem +link path=etc/openssl/certs/97b4211c.0 \ + target=../../certs/CA/GTE_CyberTrust_Root_CA.pem +link path=etc/openssl/certs/9d6523ce.0 \ + target=../../certs/CA/ePKI_Root_Certification_Authority.pem +link path=etc/openssl/certs/9dbefe7b.0 \ + target=../../certs/CA/Security_Communication_EV_RootCA1.pem +link path=etc/openssl/certs/9ec3a561.0 \ + target=../../certs/CA/UTN_USERFirst_Email_Root_CA.pem +link path=etc/openssl/certs/a0bc6fbb.0 \ + target=../../certs/CA/Camerfirma_Global_Chambersign_Root.pem +link path=etc/openssl/certs/a15b3b6b.0 \ + target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_3.pem +link path=etc/openssl/certs/a2df7ad7.0 \ + target=../../certs/CA/AddTrust_Public_Services_Root.pem +link path=etc/openssl/certs/a3896b44.0 \ + target=../../certs/CA/Security_Communication_Root_CA.pem +link path=etc/openssl/certs/a6776c69.0 \ + target=../../certs/CA/IPS_Chained_CAs_root.pem +link path=etc/openssl/certs/a7605362.0 \ + target=../../certs/CA/Sonera_Class_2_Root_CA.pem +link path=etc/openssl/certs/aaa45464.0 \ + target=../../certs/CA/Thawte_Time_Stamping_CA.pem +link path=etc/openssl/certs/add67345.0 \ + target=../../certs/CA/NetLock_Notary_Class_A_Root.pem +link path=etc/openssl/certs/b0f3e76e.0 \ + target=../../certs/CA/GlobalSign_Root_CA.pem +link path=etc/openssl/certs/b5f329fa.0 \ + target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem +link path=etc/openssl/certs/bcdd5959.0 \ + target=../../certs/CA/ValiCert_Class_2_VA.pem +link path=etc/openssl/certs/bda4cc84.0 \ + target=../../certs/CA/America_Online_Root_Certification_Authority_1.pem +link path=etc/openssl/certs/bdacca6f.0 \ + target=../../certs/CA/Secure_Global_CA.pem +link path=etc/openssl/certs/bf64f35b.0 \ + target=../../certs/CA/Entrust_Root_Certification_Authority.pem +link path=etc/openssl/certs/bf87590f.0 \ + target=../../certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem +link path=etc/openssl/certs/c0cafbd2.0 \ + target=../../certs/CA/DigiNotar_Root_CA.pem +link path=etc/openssl/certs/c19d42c7.0 \ + target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem +link path=etc/openssl/certs/c215bc69.0 \ + target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_1.pem +link path=etc/openssl/certs/c33a80d4.0 \ + target=../../certs/CA/Thawte_Premium_Server_CA.pem +link path=etc/openssl/certs/c527e4ab.0 \ + target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem +link path=etc/openssl/certs/c9bc75ba.0 \ + target=../../certs/CA/ABAecom_sub.,_Am._Bankers_Assn._Root_CA.pem +link path=etc/openssl/certs/cb796bc1.0 target=../../certs/CA/StartCom_Ltd..pem +link path=etc/openssl/certs/ccb919f9.0 \ + target=../../certs/CA/UTN_USERFirst_Object_Root_CA.pem +link path=etc/openssl/certs/cdaebb72.0 \ + target=../../certs/CA/Staat_der_Nederlanden_Root_CA.pem +link path=etc/openssl/certs/cf701eeb.0 \ + target=../../certs/CA/SecureTrust_CA.pem +link path=etc/openssl/certs/d2adc77d.0 \ + target=../../certs/CA/Entrust.net_Global_Secure_Personal_CA.pem +link path=etc/openssl/certs/d537fba6.0 \ + target=../../certs/CA/TDC_Internet_Root_CA.pem +link path=etc/openssl/certs/d78a75c7.0 \ + target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem +link path=etc/openssl/certs/d8274e24.0 \ + target=../../certs/CA/UTN-USER_First-Network_Applications.pem +link path=etc/openssl/certs/ddc328ff.0 \ + target=../../certs/CA/Thawte_Server_CA.pem +link path=etc/openssl/certs/e268a4c5.0 \ + target=../../certs/CA/AddTrust_Low-Value_Services_Root.pem +link path=etc/openssl/certs/e60bf0c0.0 \ + target=../../certs/CA/Swisscom_Root_CA_1.pem +link path=etc/openssl/certs/e7461595.0 \ + target=../../certs/CA/MD5_Collisions_Forged_Rogue_CA_25c3.pem +link path=etc/openssl/certs/e775ed2d.0 \ + target=../../certs/CA/GeoTrust_Universal_CA.pem +link path=etc/openssl/certs/e7b8d656.0 \ + target=../../certs/CA/Equifax_Secure_eBusiness_CA_1.pem +link path=etc/openssl/certs/ed049835.0 \ + target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem +link path=etc/openssl/certs/ed524cf5.0 \ + target=../../certs/CA/Entrust.net_Secure_Server_CA.pem +link path=etc/openssl/certs/ed62f4e3.0 \ + target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem +link path=etc/openssl/certs/ee7cd6fb.0 \ + target=../../certs/CA/Camerfirma_Chambers_of_Commerce_Root.pem +link path=etc/openssl/certs/f3cf1e8e.0 \ + target=../../certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem +link path=etc/openssl/certs/f4996e82.0 \ + target=../../certs/CA/ValiCert_Class_1_VA.pem +link path=etc/openssl/certs/f559733c.0 \ + target=../../certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem +link path=etc/openssl/certs/f58a60fe.0 \ + target=../../certs/CA/ComSign_Secured_CA.pem +link path=etc/openssl/certs/f61bff45.0 \ + target=../../certs/CA/Microsec_e-Szigno_Root_CA.pem +link path=etc/openssl/certs/f64d9715.0 \ + target=../../certs/CA/IPS_Servidores_root.pem +link path=etc/openssl/certs/f73e89fd.0 \ + target=../../certs/CA/Verisign_RSA_Secure_Server_CA.pem +link path=etc/openssl/certs/f950ccc2.0 \ + target=../../certs/CA/IPS_CLASE1_root.pem +link path=etc/openssl/certs/facacbc6.0 \ + target=../../certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem +link path=etc/openssl/certs/fde84897.0 target=../../certs/CA/Certigna.pem +link path=etc/openssl/certs/ff588423.0 target=../../certs/CA/ComSign_CA.pem +link path=etc/openssl/certs/ff783690.0 \ + target=../../certs/CA/UTN_USERFirst_Hardware_Root_CA.pem diff --git a/usr/src/pkg/manifests/developer-appcert.mf b/usr/src/pkg/manifests/developer-appcert.mf index 498773816d..8f2f51d9b5 100644 --- a/usr/src/pkg/manifests/developer-appcert.mf +++ b/usr/src/pkg/manifests/developer-appcert.mf @@ -46,11 +46,9 @@ file path=usr/lib/abi/appcert/static_prof mode=0555 file path=usr/lib/abi/appcert/symcheck mode=0555 file path=usr/lib/abi/appcert/symprof mode=0555 file path=usr/lib/abi/appcert/symreport mode=0555 -legacy pkg=SUNWapct arch=$(ARCH) category=system \ +legacy pkg=SUNWapct \ 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" 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 265eb03df9..b7a3727b0e 100644 --- a/usr/src/pkg/manifests/developer-apptrace-platform.mf +++ b/usr/src/pkg/manifests/developer-apptrace-platform.mf @@ -91,10 +91,8 @@ dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60 group=sys dir path=usr/platform/SUNW,UltraSPARC-IIe-NetraCT-60/lib dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract group=sys dir path=usr/platform/SUNW,UltraSPARC-IIi-Netract/lib -legacy pkg=SUNWpstl.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWpstl.u arch=$(ARCH).sun4u \ desc="Apptrace processor specific shared objects" \ - hotline="Please contact your local service provider" \ - name="Platform specific apptrace support" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Platform specific apptrace support" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf b/usr/src/pkg/manifests/developer-apptrace-ucblib.mf index ec31b1e2e2..df853bf070 100644 --- a/usr/src/pkg/manifests/developer-apptrace-ucblib.mf +++ b/usr/src/pkg/manifests/developer-apptrace-ucblib.mf @@ -32,9 +32,7 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/ucblib -legacy pkg=SUNWucbt arch=$(ARCH) category=system \ +legacy pkg=SUNWucbt \ 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" 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 4e68da5684..c6e3900f22 100644 --- a/usr/src/pkg/manifests/developer-apptrace.mf +++ b/usr/src/pkg/manifests/developer-apptrace.mf @@ -38,10 +38,8 @@ dir path=usr/lib/abi/$(ARCH64) file path=usr/bin/apptrace mode=0555 file path=usr/lib/abi/$(ARCH64)/apptrace.so.1 file path=usr/lib/abi/apptrace.so.1 -legacy pkg=SUNWcstl arch=$(ARCH) category=system \ +legacy pkg=SUNWcstl \ desc="Apptrace utility for application tracing, including shared objects" \ - hotline="Please contact your local service provider" \ - name="Apptrace Utility" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Apptrace Utility" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/developer-astdev.mf b/usr/src/pkg/manifests/developer-astdev.mf index d51e8709e5..fbe4a7a66a 100644 --- a/usr/src/pkg/manifests/developer-astdev.mf +++ b/usr/src/pkg/manifests/developer-astdev.mf @@ -43,11 +43,10 @@ file path=usr/ast/bin/msgget mode=0555 file path=usr/include/ast/pp.h file path=usr/include/ast/ppkey.h file path=usr/lib/libpp.so.1 -legacy pkg=SUNWastdev arch=$(ARCH) category=system \ - desc="AT&T AST development utilities" \ - hotline="Please contact your local service provider" \ - name="AT&T AST development utilities" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ast/THIRDPARTYLICENSE license=cmd/ast/THIRDPARTYLICENSE +legacy pkg=SUNWastdev desc="AT&T AST development utilities" \ + name="AT&T AST development utilities" license cr_Sun license=cr_Sun -license lib/libpp/THIRDPARTYLICENSE license=lib/libpp/THIRDPARTYLICENSE +license usr/src/cmd/ast/THIRDPARTYLICENSE \ + license=usr/src/cmd/ast/THIRDPARTYLICENSE +license usr/src/lib/libpp/THIRDPARTYLICENSE \ + license=usr/src/lib/libpp/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 3586b6370f..49fa86f3a3 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -272,14 +272,12 @@ file path=opt/onbld/man/man1/xref.1 file path=opt/onbld/man/sman1/get_depend_info.1 file path=opt/onbld/man/sman1/make_pkg_db.1 hardlink path=opt/onbld/bin/$(ARCH)/install.bin target=./install -legacy pkg=SUNWonbld arch=$(ARCH) category=system \ - desc="tools used to build the OS-Net consolidation" \ - hotline="Please contact your local service provider" \ - name="OS-Net Build Tools" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.10.22 +legacy pkg=SUNWonbld desc="tools used to build the OS-Net consolidation" \ + name="OS-Net Build Tools" version=11.11,REV=2009.10.22 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license tools/ctf/dwarf/THIRDPARTYLICENSE \ - license=tools/ctf/dwarf/THIRDPARTYLICENSE -license tools/onbld/THIRDPARTYLICENSE license=tools/onbld/THIRDPARTYLICENSE +license usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE \ + license=usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE +license usr/src/tools/onbld/THIRDPARTYLICENSE \ + license=usr/src/tools/onbld/THIRDPARTYLICENSE link path=opt/onbld/lib/python target=python2.4 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 4b2d0bc72c..305772c9fe 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 @@ -41,10 +41,7 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/fctl.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/fcip.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/fcp.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/fctl.so group=sys mode=0555 -legacy pkg=SUNWfcmdb arch=$(ARCH) category=system \ - desc="Fibre Channel adb macros and mdb modules" \ - hotline="Please contact your local service provider" \ - name="Fibre Channel adb macros and mdb modules" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWfcmdb desc="Fibre Channel adb macros and mdb modules" \ + name="Fibre Channel adb macros and mdb modules" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 3cd04a1858..4afb78bb43 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 @@ -37,11 +37,8 @@ dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys file path=usr/lib/mdb/kvm/$(ARCH64)/qlc.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/qlc.so group=sys mode=0555 -legacy pkg=SUNWqlcu arch=$(ARCH) category=system \ +legacy pkg=SUNWqlcu \ desc="Utilties associated with the Qlogic Fibre Channel Adapter" \ - hotline="Please contact your local service provider" \ - name="Qlogic Fibre Channel Adapter Utilities (usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Qlogic Fibre Channel Adapter Utilities (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_Qlogic license=lic_Qlogic diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf index 4f7e36b506..e9455ce554 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb.mf @@ -161,18 +161,18 @@ $(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 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/apix group=sys \ mode=0555 +$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/pcplusmp group=sys \ + mode=0555 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/unix group=sys \ mode=0555 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/uppc group=sys \ mode=0555 +$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/apix group=sys 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/i86pc/kernel/kmdb/apix group=sys mode=0555 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/unix group=sys \ mode=0555 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_psm group=sys \ @@ -308,22 +308,22 @@ file path=usr/lib/mdb/proc/libuutil.so group=sys mode=0555 file path=usr/lib/mdb/proc/mdb_ds.so group=sys mode=0555 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)/apix.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 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/apix.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/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/i86pc/lib/mdb/kvm/apix.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 \ @@ -362,17 +362,16 @@ hardlink path=usr/bin/$(ARCH32)/adb target=../../../usr/bin/$(ARCH32)/mdb hardlink path=usr/bin/$(ARCH64)/adb target=../../../usr/bin/$(ARCH64)/mdb hardlink path=usr/bin/adb target=../../usr/lib/isaexec hardlink path=usr/bin/mdb target=../../usr/lib/isaexec -legacy pkg=SUNWmdb arch=$(ARCH) category=system desc="Modular Debugger (MDB)" \ - hotline="Please contact your local service provider" \ - name="Modular Debugger" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWmdbr arch=$(ARCH) category=system \ - desc="Modular Debugger (MDB) (Root)" \ - hotline="Please contact your local service provider" \ - name="Modular Debugger (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWmdb desc="Modular Debugger (MDB)" name="Modular Debugger" +legacy pkg=SUNWmdbr desc="Modular Debugger (MDB) (Root)" \ + name="Modular Debugger (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE +license usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE +license usr/src/uts/common/zmod/THIRDPARTYLICENSE \ + license=usr/src/uts/common/zmod/THIRDPARTYLICENSE $(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 diff --git a/usr/src/pkg/manifests/developer-driver-ftsafe.mf b/usr/src/pkg/manifests/developer-driver-ftsafe.mf index 65e56f9ee4..679986fb99 100644 --- a/usr/src/pkg/manifests/developer-driver-ftsafe.mf +++ b/usr/src/pkg/manifests/developer-driver-ftsafe.mf @@ -42,15 +42,9 @@ 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 -legacy pkg=SUNWftdur arch=$(ARCH) category=system \ - desc="Driver Hardening Test Harness" \ - hotline="Please contact your local service provider" \ - name="ftSafe developer utilities package (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWftduu arch=$(ARCH) category=system \ - desc="Driver Hardening Test Harness (usr)" \ - hotline="Please contact your local service provider" \ - name="ftSafe developer utilities package (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWftdur desc="Driver Hardening Test Harness" \ + name="ftSafe developer utilities package (Root)" +legacy pkg=SUNWftduu desc="Driver Hardening Test Harness (usr)" \ + name="ftSafe developer utilities package (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf index ae0e693c36..6c3a025add 100644 --- a/usr/src/pkg/manifests/developer-dtrace.mf +++ b/usr/src/pkg/manifests/developer-dtrace.mf @@ -94,7 +94,7 @@ file path=usr/demo/dtrace/iothrough.d file path=usr/demo/dtrace/iotime.d file path=usr/demo/dtrace/ipio.d file path=usr/demo/dtrace/ipproto.d -file path=usr/demo/dtrace/iprb.d +$(i386_ONLY)file path=usr/demo/dtrace/iprb.d file path=usr/demo/dtrace/kstat.d file path=usr/demo/dtrace/ksyms.d file path=usr/demo/dtrace/libc.d @@ -631,14 +631,10 @@ 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 +legacy pkg=SUNWdtrc desc="Dynamic Tracing (DTrace) Clients" \ + name="DTrace Clients" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_iprb license=lic_iprb link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1 link path=usr/lib/$(ARCH64)/libdtrace_jni.so target=libdtrace_jni.so.1 link path=usr/lib/libdtrace.so target=libdtrace.so.1 diff --git a/usr/src/pkg/manifests/developer-library-lint.mf b/usr/src/pkg/manifests/developer-library-lint.mf index a2352818a6..62a9b296cd 100644 --- a/usr/src/pkg/manifests/developer-library-lint.mf +++ b/usr/src/pkg/manifests/developer-library-lint.mf @@ -353,16 +353,11 @@ file path=usr/lib/values-xpg6.o file path=usr/xpg4/lib/$(ARCH64)/llib-lcurses.ln file path=usr/xpg4/lib/llib-lcurses file path=usr/xpg4/lib/llib-lcurses.ln -legacy pkg=SUNWarc arch=$(ARCH) category=system \ +legacy pkg=SUNWarc \ desc="lint libraries and startup objects for software development" \ - hotline="Please contact your local service provider" \ - name="Lint Libraries (usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWarcr arch=$(ARCH) category=system \ - desc="lint libraries for software development" \ - hotline="Please contact your local service provider" \ - name="Lint Libraries (root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Lint Libraries (usr)" +legacy pkg=SUNWarcr desc="lint libraries for software development" \ + name="Lint Libraries (root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=lib/$(ARCH64)/llib-lposix4.ln target=./llib-lrt.ln diff --git a/usr/src/pkg/manifests/developer-library-profiled-libc.mf b/usr/src/pkg/manifests/developer-library-profiled-libc.mf index c545f4bb8c..8574cbc07a 100644 --- a/usr/src/pkg/manifests/developer-library-profiled-libc.mf +++ b/usr/src/pkg/manifests/developer-library-profiled-libc.mf @@ -34,11 +34,9 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/libp dir path=usr/lib/libp/$(ARCH64) -legacy pkg=SUNWdpl arch=$(ARCH) category=system \ +legacy pkg=SUNWdpl \ desc="system libraries compiled with profiling for software development performance measurement" \ - hotline="Please contact your local service provider" \ - name="Developer Profiled Libraries" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Developer Profiled Libraries" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libp/$(ARCH64)/libc.so.1 \ diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.mf index 027a22a206..7602c4da7e 100644 --- a/usr/src/pkg/manifests/developer-linker.mf +++ b/usr/src/pkg/manifests/developer-linker.mf @@ -73,12 +73,9 @@ file path=usr/lib/$(ARCH64)/libldstab.so.1 file path=usr/lib/abi/spec2map mode=0755 file path=usr/lib/abi/spec2trace mode=0755 file path=usr/lib/ld/map.above4G mode=0444 -link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G file path=usr/lib/ld/map.below4G mode=0444 -link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G file path=usr/lib/ld/map.bssalign mode=0444 file path=usr/lib/ld/map.default mode=0444 -link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default file path=usr/lib/ld/map.execdata mode=0444 file path=usr/lib/ld/map.filter mode=0444 file path=usr/lib/ld/map.noexbss mode=0444 @@ -97,11 +94,9 @@ hardlink path=usr/bin/gcore target=../../usr/lib/isaexec hardlink path=usr/bin/plimit target=../../usr/lib/isaexec hardlink path=usr/bin/strings target=../../usr/lib/isaexec hardlink path=usr/bin/truss target=../../usr/lib/isaexec -legacy pkg=SUNWtoo arch=$(ARCH) category=system \ +legacy pkg=SUNWtoo \ desc="utilities for software development, including ld, ldd, od, and truss" \ - hotline="Please contact your local service provider" \ - name="Programming Tools" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Programming Tools" license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL @@ -111,5 +106,8 @@ link path=usr/ccs/bin/$(ARCH64)/ld target=../../../bin/$(ARCH64)/ld link path=usr/ccs/bin/ld target=../../bin/ld link path=usr/ccs/bin/regcmp target=../../bin/regcmp link path=usr/ccs/lib/link_audit target=../../lib/link_audit +link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G +link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G +link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default link path=usr/lib/link_audit/32 target=. link path=usr/lib/link_audit/64 target=$(ARCH64) diff --git a/usr/src/pkg/manifests/developer-object-file.mf b/usr/src/pkg/manifests/developer-object-file.mf index 4b662ee421..0e22b2fd18 100644 --- a/usr/src/pkg/manifests/developer-object-file.mf +++ b/usr/src/pkg/manifests/developer-object-file.mf @@ -43,6 +43,7 @@ dir path=usr/lib/elfedit/$(ARCH64) dir path=usr/share group=sys dir path=usr/share/lib group=sys dir path=usr/share/lib/ccs +file path=usr/bin/$(ARCH64)/ar mode=0555 file path=usr/bin/$(ARCH64)/dump mode=0555 file path=usr/bin/$(ARCH64)/elfdump mode=0555 file path=usr/bin/$(ARCH64)/elfedit mode=0555 @@ -99,15 +100,14 @@ file path=usr/share/lib/ccs/nrform file path=usr/share/lib/ccs/yaccpar hardlink path=usr/bin/$(ARCH64)/strip target=../../bin/$(ARCH64)/mcs hardlink path=usr/bin/strip target=../bin/mcs -legacy pkg=SUNWbtool arch=$(ARCH) category=system \ +legacy pkg=SUNWbtool \ desc="software development utilities, including ar, dis, dump, elfdump, elfedit, lex, lorder, mcs, nm, prof, ranlib, rpcgen, size, strip, tsort, and yacc" \ - hotline="Please contact your local service provider" \ - name="CCS tools bundled with SunOS" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/backup/dump/THIRDPARTYLICENSE \ - license=cmd/backup/dump/THIRDPARTYLICENSE + name="CCS tools bundled with SunOS" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/backup/dump/THIRDPARTYLICENSE \ + license=usr/src/cmd/backup/dump/THIRDPARTYLICENSE +link path=usr/ccs/bin/$(ARCH64)/ar target=../../../bin/$(ARCH64)/ar link path=usr/ccs/bin/$(ARCH64)/dump target=../../../bin/$(ARCH64)/dump link path=usr/ccs/bin/$(ARCH64)/elfdump target=../../../bin/$(ARCH64)/elfdump link path=usr/ccs/bin/$(ARCH64)/mcs target=../../../bin/$(ARCH64)/mcs diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf index b615b14b70..8e8cfdce21 100644 --- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf +++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf @@ -49,9 +49,10 @@ depend fmri=library/perl-5/xml-parser@0.5.11-0.133 type=require depend fmri=library/security/trousers@0.3.2-0.133 type=require depend fmri=library/tooltalk@0.5.11-0.133 type=require depend fmri=package/svr4@0.5.11-0.133 type=require -depend fmri=runtime/perl-584/extra@5.8.4-0.133 type=require -depend fmri=runtime/perl-510@5.10.0-0.133 type=require +depend fmri=print/cups@1.4.2-0.133 type=require depend fmri=runtime/perl-510/extra@5.10.0-0.133 type=require +depend fmri=runtime/perl-510@5.10.0-0.133 type=require +depend fmri=runtime/perl-584/extra@5.8.4-0.133 type=require depend fmri=storage/svm@0.5.11-0.133 type=require depend fmri=system/data/terminfo@0.5.11-0.133 type=require depend fmri=system/header@0.5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/developer-tnf.mf b/usr/src/pkg/manifests/developer-tnf.mf index 6aff91bbc3..0ba6d6f860 100644 --- a/usr/src/pkg/manifests/developer-tnf.mf +++ b/usr/src/pkg/manifests/developer-tnf.mf @@ -41,11 +41,9 @@ file path=usr/include/tnf/probe.h file path=usr/include/tnf/tnf.h file path=usr/include/tnf/writer.h file path=usr/lib/libtnf.so.1 -legacy pkg=SUNWtnfd arch=$(ARCH) category=system \ +legacy pkg=SUNWtnfd \ desc="utilities needed by developers using Trace Normal Format (TNF) facilities" \ - hotline="Please contact your local service provider" \ - name="TNF Developer Components" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="TNF Developer Components" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libtnf.so target=./libtnf.so.1 diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf index 5e25d3817b..c4f258fe15 100644 --- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf +++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf @@ -78,15 +78,14 @@ $(i386_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.5 \ target=pcbe.GenuineIntel.6 $(i386_ONLY)hardlink path=usr/kernel/pcbe/pcbe.GenuineIntel.5 \ target=pcbe.GenuineIntel.6 -legacy pkg=SUNWcpcu arch=$(ARCH) category=system \ - desc="CPU Performance Counter libraries and utilities" \ - hotline="Please contact your local service provider" \ - name="CPU Performance Counter libraries and utilities" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWcpcu desc="CPU Performance Counter libraries and utilities" \ + name="CPU Performance Counter libraries and utilities" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/intel/pcbe/THIRDPARTYLICENSE \ - license=uts/intel/pcbe/THIRDPARTYLICENSE +$(i386_ONLY)license usr/src/uts/intel/pcbe/THIRDPARTYLICENSE \ + license=usr/src/uts/intel/pcbe/THIRDPARTYLICENSE +$(sparc_ONLY)license usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE \ + license=usr/src/uts/sun4u/pcbe/THIRDPARTYLICENSE $(i386_ONLY)link path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.23 \ target=pcbe.GenuineIntel.6.15 $(i386_ONLY)link path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.26 \ diff --git a/usr/src/pkg/manifests/diagnostic-latencytop.mf b/usr/src/pkg/manifests/diagnostic-latencytop.mf index 53389c582a..71c8a46783 100644 --- a/usr/src/pkg/manifests/diagnostic-latencytop.mf +++ b/usr/src/pkg/manifests/diagnostic-latencytop.mf @@ -36,9 +36,6 @@ dir path=usr/bin/$(ARCH64) $(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 +legacy pkg=SUNWlatencytop desc="LatencyTOP tool" name="LatencyTOP tool" 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 7aae840610..9300d3a652 100644 --- a/usr/src/pkg/manifests/diagnostic-powertop.mf +++ b/usr/src/pkg/manifests/diagnostic-powertop.mf @@ -36,7 +36,6 @@ dir path=usr/bin/$(ARCH64) $(i386_ONLY)file path=usr/bin/$(ARCH32)/powertop mode=0555 file path=usr/bin/$(ARCH64)/powertop mode=0555 hardlink path=usr/bin/powertop target=../../usr/lib/isaexec -legacy pkg=SUNWpowertop arch=$(ARCH) category=system desc="PowerTOP tool" \ - hotline="Please contact your local service provider" name="PowerTOP tool" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license lic_GPLv2 license=lic_GPLv2 +legacy pkg=SUNWpowertop desc="PowerTOP tool" name="PowerTOP tool" +license usr/src/cmd/powertop/common/COPYING \ + license=usr/src/cmd/powertop/common/COPYING diff --git a/usr/src/pkg/manifests/driver-audio-audio810.mf b/usr/src/pkg/manifests/driver-audio-audio810.mf index f9d46f7893..44e8b8bf25 100644 --- a/usr/src/pkg/manifests/driver-audio-audio810.mf +++ b/usr/src/pkg/manifests/driver-audio-audio810.mf @@ -66,10 +66,8 @@ 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 -legacy pkg=SUNWad810 arch=$(ARCH) category=system \ +legacy pkg=SUNWad810 \ desc="SunOS audio device driver for W1100z & W2100z workstations" \ - hotline="Please contact your local service provider" \ - name="SUNW W1100z & W2100z Audio Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="SUNW W1100z & W2100z Audio Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audiocmi.mf b/usr/src/pkg/manifests/driver-audio-audiocmi.mf index f3a0f3ac32..4a81bf51aa 100644 --- a/usr/src/pkg/manifests/driver-audio-audiocmi.mf +++ b/usr/src/pkg/manifests/driver-audio-audiocmi.mf @@ -43,10 +43,7 @@ driver name=audiocmi \ alias=pci13f6,111 file path=kernel/drv/$(ARCH64)/audiocmi group=sys file path=kernel/drv/audiocmi group=sys -legacy pkg=SUNWaudiocmi arch=$(ARCH) category=system \ - desc="SunOS audio device driver for C-Media 8738" \ - hotline="Please contact your local service provider" \ - name="C-Media 8738 Family Audio Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudiocmi desc="SunOS audio device driver for C-Media 8738" \ + name="C-Media 8738 Family Audio Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf index 3999e5e6d6..85474680b4 100644 --- a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf +++ b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf @@ -43,10 +43,8 @@ driver name=audioemu10k \ alias=pci1102,8 file path=kernel/drv/$(ARCH64)/audioemu10k group=sys file path=kernel/drv/audioemu10k group=sys -legacy pkg=SUNWaudioemu10k arch=$(ARCH) category=system \ +legacy pkg=SUNWaudioemu10k \ desc="SunOS audio device driver for Creative EMU10K" \ - hotline="Please contact your local service provider" \ - name="Creative EMU10K Audio Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Creative EMU10K Audio Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audiohd.mf b/usr/src/pkg/manifests/driver-audio-audiohd.mf index e3be186427..da7792c432 100644 --- a/usr/src/pkg/manifests/driver-audio-audiohd.mf +++ b/usr/src/pkg/manifests/driver-audio-audiohd.mf @@ -46,10 +46,7 @@ driver name=audiohd \ file path=kernel/drv/$(ARCH64)/audiohd group=sys file path=kernel/drv/audiohd group=sys 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" \ - name="SUNW High Definition Audio Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudiohd desc="SunOS audio device driver for Munich workstation" \ + name="SUNW High Definition Audio Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audioixp.mf b/usr/src/pkg/manifests/driver-audio-audioixp.mf index 7274cd3699..7d31cd9f4e 100644 --- a/usr/src/pkg/manifests/driver-audio-audioixp.mf +++ b/usr/src/pkg/manifests/driver-audio-audioixp.mf @@ -44,10 +44,8 @@ driver name=audioixp \ alias=pci1002,4370 file path=kernel/drv/$(ARCH64)/audioixp group=sys file path=kernel/drv/audioixp group=sys -legacy pkg=SUNWadixp arch=$(ARCH) category=system \ +legacy pkg=SUNWadixp \ desc="SunOS audio device driver for ATI IXP integrated audio hardware" \ - hotline="Please contact your local service provider" \ - name="SUNW Audio Driver for ATI IXP" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="SUNW Audio Driver for ATI IXP" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audiols.mf b/usr/src/pkg/manifests/driver-audio-audiols.mf index ae485dc3c9..fd54a2c928 100644 --- a/usr/src/pkg/manifests/driver-audio-audiols.mf +++ b/usr/src/pkg/manifests/driver-audio-audiols.mf @@ -41,10 +41,7 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=audiols alias=pci1102,7 file path=kernel/drv/$(ARCH64)/audiols group=sys $(i386_ONLY)file path=kernel/drv/audiols group=sys -legacy pkg=SUNWaudiols arch=$(ARCH) category=system \ - desc="SunOS audio device driver for Creative Audigy LS" \ - hotline="Please contact your local service provider" \ - name="Creative Audigy LS Audio Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudiols desc="SunOS audio device driver for Creative Audigy LS" \ + name="Creative Audigy LS Audio Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audiop16x.mf b/usr/src/pkg/manifests/driver-audio-audiop16x.mf index b761774906..e35bc303ca 100644 --- a/usr/src/pkg/manifests/driver-audio-audiop16x.mf +++ b/usr/src/pkg/manifests/driver-audio-audiop16x.mf @@ -41,10 +41,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=audiop16x alias=pci1102,6 file path=kernel/drv/$(ARCH64)/audiop16x group=sys $(i386_ONLY)file path=kernel/drv/audiop16x group=sys -legacy pkg=SUNWaudiop16x arch=$(ARCH) category=system \ +legacy pkg=SUNWaudiop16x \ desc="SunOS audio device driver for Creative P16X (EMU10K1X)" \ - hotline="Please contact your local service provider" \ - name="Creative P16X Audio Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Creative P16X Audio Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audiosolo.mf b/usr/src/pkg/manifests/driver-audio-audiosolo.mf index 6e3cd59b39..6c84cf3348 100644 --- a/usr/src/pkg/manifests/driver-audio-audiosolo.mf +++ b/usr/src/pkg/manifests/driver-audio-audiosolo.mf @@ -40,11 +40,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=audiosolo alias=pci125d,1969 file path=kernel/drv/$(ARCH64)/audiosolo group=sys file path=kernel/drv/audiosolo group=sys -legacy pkg=SUNWaudiosolo arch=$(ARCH) category=system \ - desc="SunOS audio device driver for ESS Solo-1" \ - hotline="Please contact your local service provider" \ - name="ESS Solo-1 Audio Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudiosolo desc="SunOS audio device driver for ESS Solo-1" \ + name="ESS Solo-1 Audio Driver" license cr_Sun license=cr_Sun -license uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE \ - license=uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE +license usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/audio/drv/audiosolo/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf index b4f9e54134..7824fb983b 100644 --- a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf +++ b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf @@ -41,10 +41,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=audiovia823x alias=pci1106,3059 file path=kernel/drv/$(ARCH64)/audiovia823x group=sys file path=kernel/drv/audiovia823x group=sys -legacy pkg=SUNWvia823x arch=$(ARCH) category=system \ +legacy pkg=SUNWvia823x \ desc="SunOS audio device driver for VIA VT823x south bridges" \ - hotline="Please contact your local service provider" \ - name="SUNW Audio Driver for VIA VT823x" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="SUNW Audio Driver for VIA VT823x" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio-audiovia97.mf b/usr/src/pkg/manifests/driver-audio-audiovia97.mf index 1186d05d17..1d54aa7664 100644 --- a/usr/src/pkg/manifests/driver-audio-audiovia97.mf +++ b/usr/src/pkg/manifests/driver-audio-audiovia97.mf @@ -38,10 +38,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys driver name=audiovia97 alias=pci1106,3058 file path=kernel/drv/audiovia97 group=sys -legacy pkg=SUNWaudiovia97 arch=$(ARCH) category=system \ - desc="SunOS audio device driver for Via 82C686" \ - hotline="Please contact your local service provider" \ - name="Via 82C686 Audio Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudiovia97 desc="SunOS audio device driver for Via 82C686" \ + name="Via 82C686 Audio Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-audio.mf b/usr/src/pkg/manifests/driver-audio.mf index fac9abe412..ec83aaa8b0 100644 --- a/usr/src/pkg/manifests/driver-audio.mf +++ b/usr/src/pkg/manifests/driver-audio.mf @@ -61,9 +61,6 @@ $(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 $(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" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudd desc="SunOS audio device drivers" name="Audio Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-cpu-us.mf b/usr/src/pkg/manifests/driver-cpu-us.mf index 101e8cdcc5..3cfc93fd99 100644 --- a/usr/src/pkg/manifests/driver-cpu-us.mf +++ b/usr/src/pkg/manifests/driver-cpu-us.mf @@ -46,11 +46,8 @@ driver name=us \ alias=SUNW,UltraSPARC-IIIi+ \ alias=SUNW,UltraSPARC-IIe file path=platform/sun4u/kernel/drv/$(ARCH64)/us group=sys -legacy pkg=SUNWus.u arch=$(ARCH).sun4u category=system \ - desc="UltraSPARC CPU Device Driver" \ - hotline="Please contact your local service provider" \ - name="UltraSPARC CPU Device Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWus.u arch=$(ARCH).sun4u desc="UltraSPARC CPU Device Driver" \ + name="UltraSPARC CPU Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license license_in_headers license=license_in_headers diff --git a/usr/src/pkg/manifests/driver-crypto-dca.mf b/usr/src/pkg/manifests/driver-crypto-dca.mf index a79840d717..324a196898 100644 --- a/usr/src/pkg/manifests/driver-crypto-dca.mf +++ b/usr/src/pkg/manifests/driver-crypto-dca.mf @@ -59,16 +59,10 @@ file path=usr/lib/fm/eft/sca1000.eft mode=0444 file path=usr/lib/fm/eft/sca500.eft mode=0444 file path=usr/lib/locale/C/LC_MESSAGES/SCA1000.mo mode=0444 file path=usr/lib/locale/C/LC_MESSAGES/SCA500.mo mode=0444 -legacy pkg=SUNWdcaf arch=$(ARCH) category=system \ - desc="DCA Crypto Accelerator Supplemental Files (usr)" \ - hotline="Please contact your local service provider" \ - name="DCA Crypto Accelerator (usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWdcar arch=$(ARCH) category=system \ - desc="DCA Crypto Accelerator driver" \ - hotline="Please contact your local service provider" \ - name="DCA Crypto Accelerator (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWdcaf desc="DCA Crypto Accelerator Supplemental Files (usr)" \ + name="DCA Crypto Accelerator (usr)" +legacy pkg=SUNWdcar desc="DCA Crypto Accelerator driver" \ + name="DCA Crypto Accelerator (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL $(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require diff --git a/usr/src/pkg/manifests/driver-crypto-dprov.mf b/usr/src/pkg/manifests/driver-crypto-dprov.mf index cf144486dc..80cbc9f09b 100644 --- a/usr/src/pkg/manifests/driver-crypto-dprov.mf +++ b/usr/src/pkg/manifests/driver-crypto-dprov.mf @@ -48,11 +48,8 @@ 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 -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 +legacy pkg=SUNWcryptoint desc="Kernel Crypto Framework Test Driver" \ + name="Kernel Crypto Framework Test Driver" 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 94c9454f3a..fb612ef8e4 100644 --- a/usr/src/pkg/manifests/driver-crypto-n2cp.mf +++ b/usr/src/pkg/manifests/driver-crypto-n2cp.mf @@ -46,10 +46,7 @@ driver name=n2cp \ alias=SUNW,vf-cwq file path=platform/sun4v/kernel/drv/$(ARCH64)/n2cp group=sys 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" \ - name="UltraSPARC-T2 Crypto Provider" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWn2cp.v arch=$(ARCH).sun4v desc="UltraSPARC-T2 Crypto Provider" \ + name="UltraSPARC-T2 Crypto Provider" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-crypto-tpm.mf b/usr/src/pkg/manifests/driver-crypto-tpm.mf index b1af89113e..e6be3f53e3 100644 --- a/usr/src/pkg/manifests/driver-crypto-tpm.mf +++ b/usr/src/pkg/manifests/driver-crypto-tpm.mf @@ -50,10 +50,7 @@ $(i386_ONLY)driver name=tpm devlink=type=ddi_pseudo;name=tpm\t\D \ $(i386_ONLY)file path=kernel/drv/$(ARCH64)/tpm group=sys $(i386_ONLY)file path=kernel/drv/tpm group=sys $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/tpm group=sys -legacy pkg=SUNWtpm arch=$(ARCH) category=system \ - desc="Trusted Platform Module driver" \ - hotline="Please contact your local service provider" \ - name="Trusted Platform Module driver" vendor="Sun Microsystems, Inc." \ - version=11.11.0,REV=2009.11.11 +legacy pkg=SUNWtpm desc="Trusted Platform Module driver" \ + name="Trusted Platform Module driver" version=11.11.0,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-firewire.mf b/usr/src/pkg/manifests/driver-firewire.mf index ffbe1a2637..790173b2df 100644 --- a/usr/src/pkg/manifests/driver-firewire.mf +++ b/usr/src/pkg/manifests/driver-firewire.mf @@ -46,10 +46,7 @@ $(i386_ONLY)file path=kernel/drv/hci1394 group=sys 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" \ - name="Sun IEEE1394 Framework" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNW1394 desc="IEEE1394 Framework and OpenHCI Driver" \ + name="Sun IEEE1394 Framework" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-graphics-agpgart.mf b/usr/src/pkg/manifests/driver-graphics-agpgart.mf index 1f3adbba10..6994aed198 100644 --- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf +++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf @@ -81,12 +81,9 @@ file path=kernel/drv/$(ARCH64)_gart group=sys file path=kernel/drv/agpgart group=sys 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 +legacy pkg=SUNWagp desc="AGP GART driver for x86 workstations" \ + name="AGP GART Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/sys/THIRDPARTYLICENSE.agpgart \ - license=uts/common/sys/THIRDPARTYLICENSE.agpgart +license usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart \ + license=usr/src/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 0448e924f4..6a4a28a973 100644 --- a/usr/src/pkg/manifests/driver-graphics-atiatom.mf +++ b/usr/src/pkg/manifests/driver-graphics-atiatom.mf @@ -41,11 +41,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=atiatom alias=pci1002,4752 perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/atiatom group=sys file path=kernel/drv/atiatom group=sys -legacy pkg=SUNWatigfx arch=$(ARCH) category=system \ - desc="Drivers for ATI framebuffer hardware" \ - hotline="Please contact your local service provider" \ - name="ATI Framebuffer Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWatigfx desc="Drivers for ATI framebuffer hardware" \ + name="ATI Framebuffer Drivers" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-graphics-av1394.mf b/usr/src/pkg/manifests/driver-graphics-av1394.mf index bbb2ba81bf..ea5d55a031 100644 --- a/usr/src/pkg/manifests/driver-graphics-av1394.mf +++ b/usr/src/pkg/manifests/driver-graphics-av1394.mf @@ -42,9 +42,6 @@ driver name=av1394 perms="* 0600 root sys" \ alias=firewire00a02d,010001 file path=kernel/drv/$(ARCH64)/av1394 group=sys $(i386_ONLY)file path=kernel/drv/av1394 group=sys -legacy pkg=SUNWav1394 arch=$(ARCH) category=system desc="IEEE1394 AV Driver" \ - hotline="Please contact your local service provider" \ - name="IEEE1394 AV Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWav1394 desc="IEEE1394 AV Driver" name="IEEE1394 AV Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 3fee2d602d..7b2eaa87e0 100644 --- a/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf +++ b/usr/src/pkg/manifests/driver-graphics-dcam1394-devfsadm-dcam1394.mf @@ -44,10 +44,7 @@ dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys file path=usr/include/sys/dcam/dcam1394_io.h file path=usr/lib/devfsadm/linkmod/SUNW_dcam1394_link.so group=sys -legacy pkg=SUNWfwdcu arch=$(ARCH) category=system \ - desc="Sun IEEE1394 Video Conferencing support" \ - hotline="Please contact your local service provider" \ - name="Sun IEEE1394 Video Conferencing Support (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWfwdcu desc="Sun IEEE1394 Video Conferencing support" \ + name="Sun IEEE1394 Video Conferencing Support (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf index a9ac056749..80e40ebbff 100644 --- a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf +++ b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf @@ -42,10 +42,7 @@ driver name=dcam1394 perms="* 0666 root sys" \ alias=firewire00a02d,000100 file path=kernel/drv/$(ARCH64)/dcam1394 group=sys $(i386_ONLY)file path=kernel/drv/dcam1394 group=sys -legacy pkg=SUNWfwdc arch=$(ARCH) category=system \ - desc="IEEE1394 Video Conferencing Class Driver" \ - hotline="Please contact your local service provider" \ - name="IEEE1394 Video Conferencing Class Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWfwdc desc="IEEE1394 Video Conferencing Class Driver" \ + name="IEEE1394 Video Conferencing Class Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-graphics-drm.mf b/usr/src/pkg/manifests/driver-graphics-drm.mf index 374a5923b4..ea6cf6eced 100644 --- a/usr/src/pkg/manifests/driver-graphics-drm.mf +++ b/usr/src/pkg/manifests/driver-graphics-drm.mf @@ -72,11 +72,8 @@ file path=kernel/drv/i915 group=sys file path=kernel/drv/radeon group=sys 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" \ - name="DRM Kernel Drivers, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWdrmr desc="Direct Rendering Manager kernel drivers and modules" \ + name="DRM Kernel Drivers, (Root)" license cr_Sun license=cr_Sun -license uts/common/io/drm/THIRDPARTYLICENSE \ - license=uts/common/io/drm/THIRDPARTYLICENSE +license usr/src/uts/common/io/drm/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/drm/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-graphics-usbvc.mf b/usr/src/pkg/manifests/driver-graphics-usbvc.mf index 5eb88c9d92..7b4ae7900a 100644 --- a/usr/src/pkg/manifests/driver-graphics-usbvc.mf +++ b/usr/src/pkg/manifests/driver-graphics-usbvc.mf @@ -45,10 +45,7 @@ driver name=usbvc perms="* 0666 root sys" \ alias=usbia46d,8c5.config1.0 file path=kernel/drv/$(ARCH64)/usbvc group=sys $(i386_ONLY)file path=kernel/drv/usbvc group=sys -legacy pkg=SUNWusbvc arch=$(ARCH) category=system \ - desc="usbvc (USB Video Class Driver)" \ - hotline="Please contact your local service provider" \ - name="USB Video Class Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWusbvc desc="usbvc (USB Video Class Driver)" \ + name="USB Video Class Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-i86pc-fipe.mf b/usr/src/pkg/manifests/driver-i86pc-fipe.mf index 3043619fd7..5868cfcefe 100644 --- a/usr/src/pkg/manifests/driver-i86pc-fipe.mf +++ b/usr/src/pkg/manifests/driver-i86pc-fipe.mf @@ -47,11 +47,7 @@ driver name=fipe \ 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 -legacy pkg=SUNWfipe arch=$(ARCH) category=system \ - desc="Intel 5000/7300 memory power management driver" \ - hotline="Please contact your local service provider" \ - name="Intel 5000/7300 memory power management driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cr_Intel.SUNWfipe license=cr_Intel -license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL +legacy pkg=SUNWfipe desc="Intel 5000/7300 memory power management driver" \ + name="Intel 5000/7300 memory power management driver" +license usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE \ + license=usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-i86pc-ioat.mf b/usr/src/pkg/manifests/driver-i86pc-ioat.mf index 5f3911285e..08f72d007c 100644 --- a/usr/src/pkg/manifests/driver-i86pc-ioat.mf +++ b/usr/src/pkg/manifests/driver-i86pc-ioat.mf @@ -59,9 +59,6 @@ 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 -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." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWdcopy desc="Sun dcopy DMA drivers" name="Sun dcopy DMA drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-i86pc-platform.mf b/usr/src/pkg/manifests/driver-i86pc-platform.mf index 96fc5bf0db..349ea537db 100644 --- a/usr/src/pkg/manifests/driver-i86pc-platform.mf +++ b/usr/src/pkg/manifests/driver-i86pc-platform.mf @@ -49,15 +49,6 @@ driver name=cmdk perms="* 0640 root sys" driver name=ecpp alias=lp perms="* 0666 root sys" driver name=fd perms="* 0666 root sys" driver name=fdc -driver name=ncrs class=scsi \ - alias=pci1000,1 \ - alias=pci1000,2 \ - alias=pci1000,3 \ - alias=pci1000,4 \ - alias=pci1000,6 \ - alias=pci1000,8f \ - alias=pci1000,c \ - alias=pci1000,f file path=kernel/drv/$(ARCH64)/asy group=sys file path=kernel/drv/$(ARCH64)/cmdk group=sys file path=kernel/drv/$(ARCH64)/ecpp group=sys @@ -73,8 +64,6 @@ file path=kernel/drv/fd group=sys file path=kernel/drv/fd.conf group=sys file path=kernel/drv/fdc group=sys file path=kernel/drv/fdc.conf group=sys -file path=kernel/drv/ncrs group=sys -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 @@ -91,12 +80,8 @@ 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 \ +legacy pkg=SUNWpsdcr \ desc="Platform Support, Bus-independent Device Drivers, (Root)" \ - hotline="Please contact your local service provider" \ - name="Platform Support, Bus-independent Device Drivers (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Platform Support, Bus-independent Device Drivers (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-afe.mf b/usr/src/pkg/manifests/driver-network-afe.mf index 5c7c851ea5..c6a53339d2 100644 --- a/usr/src/pkg/manifests/driver-network-afe.mf +++ b/usr/src/pkg/manifests/driver-network-afe.mf @@ -53,11 +53,8 @@ driver name=afe clone_perms="afe 0666 root sys" perms="* 0666 root sys" \ alias=pci1737,ab08 file path=kernel/drv/$(ARCH64)/afe group=sys $(i386_ONLY)file path=kernel/drv/afe group=sys -legacy pkg=SUNWafe arch=$(ARCH) category=system \ - desc="ADMtek/Infineon Fast Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="ADMtek Ethernet Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWafe desc="ADMtek/Infineon Fast Ethernet Network Adapter Driver" \ + name="ADMtek Ethernet Driver" license cr_Sun license=cr_Sun -license uts/common/io/afe/THIRDPARTYLICENSE \ - license=uts/common/io/afe/THIRDPARTYLICENSE +license usr/src/uts/common/io/afe/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/afe/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-amd8111s.mf b/usr/src/pkg/manifests/driver-network-amd8111s.mf index 8aa376d75c..b330307de5 100644 --- a/usr/src/pkg/manifests/driver-network-amd8111s.mf +++ b/usr/src/pkg/manifests/driver-network-amd8111s.mf @@ -41,11 +41,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=amd8111s alias=pci1022,7462 file path=kernel/drv/$(ARCH64)/amd8111s group=sys file path=kernel/drv/amd8111s group=sys -legacy pkg=SUNWamd8111s arch=$(ARCH) category=system \ - desc="AMD8111 FAST Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="AMD8111 Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWamd8111s desc="AMD8111 FAST Ethernet Network Adapter Driver" \ + name="AMD8111 Fast Ethernet Driver" license cr_Sun license=cr_Sun -license uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s \ - license=uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s +license usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s \ + license=usr/src/uts/intel/io/amd8111s/THIRDPARTYLICENSE.amd8111s diff --git a/usr/src/pkg/manifests/driver-network-arbel.mf b/usr/src/pkg/manifests/driver-network-arbel.mf index 8180586d96..7b78dfda33 100644 --- a/usr/src/pkg/manifests/driver-network-arbel.mf +++ b/usr/src/pkg/manifests/driver-network-arbel.mf @@ -38,8 +38,5 @@ set name=variant.arch value=$(ARCH) dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys -legacy pkg=SUNWarbel arch=$(ARCH) category=system desc="Arbel HCA Driver" \ - hotline="Please contact your local service provider" \ - name="Sun IB Arbel HCA driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWarbel desc="Arbel HCA Driver" name="Sun IB Arbel HCA driver" license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/driver-network-arn.mf b/usr/src/pkg/manifests/driver-network-arn.mf index 9a5ec08066..a182287b70 100644 --- a/usr/src/pkg/manifests/driver-network-arn.mf +++ b/usr/src/pkg/manifests/driver-network-arn.mf @@ -43,10 +43,8 @@ driver name=arn clone_perms="arn 0666 root sys" perms="* 0666 root sys" \ alias=pciex168c,2b file path=kernel/drv/$(ARCH64)/arn group=sys file path=kernel/drv/arn group=sys -legacy pkg=SUNWarn arch=$(ARCH) category=system \ - desc="Atheros AR9xxx 802.11 Wireless NIC Driver" \ - hotline="Please contact your local service provider" \ - name="Atheros IEEE 802.11 Wireless NIC Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWarn desc="Atheros AR9xxx 802.11 Wireless NIC Driver" \ + name="Atheros IEEE 802.11 Wireless NIC Driver" license cr_Sun license=cr_Sun -license uts/common/io/arn/LICENSE license=uts/common/io/arn/LICENSE +license usr/src/uts/common/io/arn/LICENSE \ + license=usr/src/uts/common/io/arn/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-atge.mf b/usr/src/pkg/manifests/driver-network-atge.mf index ee8a894a70..7558e50894 100644 --- a/usr/src/pkg/manifests/driver-network-atge.mf +++ b/usr/src/pkg/manifests/driver-network-atge.mf @@ -44,10 +44,7 @@ driver name=atge \ alias=pciex1969,1048 file path=kernel/drv/$(ARCH64)/atge group=sys file path=kernel/drv/atge group=sys -legacy pkg=SUNWatge arch=$(ARCH) category=system \ - desc="Atheros/Attansic L1E Gigabit Ethernet" \ - hotline="Please contact your local service provider" \ - name="Atheros/Attansic L1E Gigabit Ethernet 10/100/1000 Base (AR8121/AR8113)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWatge desc="Atheros/Attansic L1E Gigabit Ethernet" \ + name="Atheros/Attansic L1E Gigabit Ethernet 10/100/1000 Base (AR8121/AR8113)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-ath.mf b/usr/src/pkg/manifests/driver-network-ath.mf index 0e6ba71c19..54cbd086a7 100644 --- a/usr/src/pkg/manifests/driver-network-ath.mf +++ b/usr/src/pkg/manifests/driver-network-ath.mf @@ -49,10 +49,8 @@ driver name=ath clone_perms="ath 0666 root sys" perms="* 0666 root sys" \ alias=pciex168c,24 file path=kernel/drv/$(ARCH64)/ath group=sys file path=kernel/drv/ath group=sys -legacy pkg=SUNWatheros arch=$(ARCH) category=system \ - desc="Atheros AR52xx 802.11b/g Wireless NIC Driver" \ - hotline="Please contact your local service provider" \ - name="Atheros 802.11b/g Wireless NIC Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWatheros desc="Atheros AR52xx 802.11b/g Wireless NIC Driver" \ + name="Atheros 802.11b/g Wireless NIC Driver" license cr_Sun license=cr_Sun -license uts/common/io/ath/LICENSE license=uts/common/io/ath/LICENSE +license usr/src/uts/common/io/ath/LICENSE \ + license=usr/src/uts/common/io/ath/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-atu.mf b/usr/src/pkg/manifests/driver-network-atu.mf index 1e661b8678..15ca1ee139 100644 --- a/usr/src/pkg/manifests/driver-network-atu.mf +++ b/usr/src/pkg/manifests/driver-network-atu.mf @@ -44,11 +44,9 @@ driver name=atu alias=usb1915,2233 clone_perms="atu 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/atu group=sys file path=kernel/drv/atu group=sys -legacy pkg=SUNWatu arch=$(ARCH) category=system \ +legacy pkg=SUNWatu \ desc="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" \ - hotline="Please contact your local service provider" \ - name="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" license cr_Sun license=cr_Sun -license uts/common/io/atu/THIRDPARTYLICENSE \ - license=uts/common/io/atu/THIRDPARTYLICENSE +license usr/src/uts/common/io/atu/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/atu/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-bfe.mf b/usr/src/pkg/manifests/driver-network-bfe.mf index 18ffdc8084..c250fde55d 100644 --- a/usr/src/pkg/manifests/driver-network-bfe.mf +++ b/usr/src/pkg/manifests/driver-network-bfe.mf @@ -44,10 +44,7 @@ driver name=bfe \ alias=pci14e4,4402 file path=kernel/drv/$(ARCH64)/bfe group=sys file path=kernel/drv/bfe group=sys -legacy pkg=SUNWbfe arch=$(ARCH) category=system \ - desc="Broadcom BCM4401 Fast Ethernet Driver" \ - hotline="Please contact your local service provider" \ - name="Broadcom BCM4401 Fast Ethernet Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWbfe desc="Broadcom BCM4401 Fast Ethernet Driver" \ + name="Broadcom BCM4401 Fast Ethernet Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-bge.mf b/usr/src/pkg/manifests/driver-network-bge.mf index dd42aa8a35..05bc55422a 100644 --- a/usr/src/pkg/manifests/driver-network-bge.mf +++ b/usr/src/pkg/manifests/driver-network-bge.mf @@ -75,9 +75,11 @@ $(i386_ONLY)driver name=bge clone_perms="bge 0666 root sys" \ alias=pci14e4,16a7 \ alias=pci14e4,16a8 \ alias=pci14e4,16c7 \ + alias=pciex14e4,1655 \ alias=pciex14e4,1656 \ alias=pciex14e4,165a \ alias=pciex14e4,165b \ + alias=pciex14e4,165c \ alias=pciex14e4,1673 \ alias=pciex14e4,1674 \ alias=pciex14e4,1677 \ @@ -86,6 +88,7 @@ $(i386_ONLY)driver name=bge clone_perms="bge 0666 root sys" \ alias=pciex14e4,1680 \ alias=pciex14e4,1681 \ alias=pciex14e4,1684 \ + alias=pciex14e4,1692 \ alias=pciex14e4,169d \ alias=pciex14e4,16fd \ alias=pciex14e4,1713 @@ -108,22 +111,22 @@ $(sparc_ONLY)driver name=bge clone_perms="bge 0666 root sys" \ alias=pci14e4,16a7 \ alias=pci14e4,16a8 \ alias=pci14e4,16c7 \ + alias=pciex14e4,1655 \ alias=pciex14e4,1656 \ alias=pciex14e4,1659 \ alias=pciex14e4,165a \ alias=pciex14e4,165b \ + alias=pciex14e4,165c \ alias=pciex14e4,1677 \ alias=pciex14e4,167a \ 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 -legacy pkg=SUNWbge arch=$(ARCH) category=system \ +legacy pkg=SUNWbge \ desc="Broadcom 57xx Gigabit Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Broadcom 57xx GE NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Broadcom 57xx GE NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/bge/THIRDPARTYLICENSE \ - license=uts/common/io/bge/THIRDPARTYLICENSE +license usr/src/uts/common/io/bge/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/bge/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-bnx.mf b/usr/src/pkg/manifests/driver-network-bnx.mf index dc6cb9606b..53c1c76ee2 100644 --- a/usr/src/pkg/manifests/driver-network-bnx.mf +++ b/usr/src/pkg/manifests/driver-network-bnx.mf @@ -53,11 +53,10 @@ 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 -legacy pkg=BRCMbnx arch=$(ARCH) category=system \ +legacy pkg=BRCMbnx \ desc="Broadcom NetXtreme II Gigabit Ethernet PCI-X/PCIE Adapter Driver" \ - hotline="Please contact your local service provider" \ name="Broadcom NetXtreme II Gigabit Ethernet Adapter Driver" \ - vendor="Broadcom Corporation, Inc." version=11.11,REV=2009.11.11 + vendor="Broadcom Corporation, Inc." license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-bnxe.mf b/usr/src/pkg/manifests/driver-network-bnxe.mf index b4c5928142..3a0b689d81 100644 --- a/usr/src/pkg/manifests/driver-network-bnxe.mf +++ b/usr/src/pkg/manifests/driver-network-bnxe.mf @@ -50,11 +50,10 @@ 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 -legacy pkg=BRCMbnxe arch=$(ARCH) category=system \ +legacy pkg=BRCMbnxe \ desc="Broadcom NetXtreme II 10 Gigabit Ethernet PCI-X/PCIE Adapter Driver" \ - hotline="Please contact your local service provider" \ name="Broadcom NetXtreme II 10GbE NIC Driver" \ - vendor="Broadcom Corporation, Inc." version=11.11,REV=2009.11.11 + vendor="Broadcom Corporation, Inc." license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-bpf.mf b/usr/src/pkg/manifests/driver-network-bpf.mf index a57d6bc2a5..786054fb35 100644 --- a/usr/src/pkg/manifests/driver-network-bpf.mf +++ b/usr/src/pkg/manifests/driver-network-bpf.mf @@ -29,6 +29,8 @@ 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) +dir path=etc group=sys +dir path=etc/sock2path.d group=sys dir path=usr group=sys dir path=usr/include dir path=usr/include/net @@ -39,6 +41,7 @@ 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=etc/sock2path.d/driver%2Fnetwork%2Fbpf group=sys file path=usr/include/net/bpf.h file path=usr/include/net/bpfdesc.h file path=usr/include/net/dlt.h @@ -48,16 +51,12 @@ $(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" \ - name="Solaris Packet header files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWpacketu arch=$(ARCH) category=system \ - desc="BPF/PF_PACKET kernel packet modules" \ - hotline="Please contact your local service provider" \ - name="Solaris Kernel Packet (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ipf/tools/IPFILTER.LICENCE license=cmd/ipf/tools/IPFILTER.LICENCE +legacy pkg=SUNWpacketh desc="C header files for BPF/PF_PACKET" \ + name="Solaris Packet header files" +legacy pkg=SUNWpacketu desc="BPF/PF_PACKET kernel packet modules" \ + name="Solaris Kernel Packet (Usr)" license cr_Sun license=cr_Sun -license uts/common/io/bpf/BPF.LICENCE license=uts/common/io/bpf/BPF.LICENCE +license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \ + license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE +license usr/src/uts/common/io/bpf/BPF.LICENCE \ + license=usr/src/uts/common/io/bpf/BPF.LICENCE diff --git a/usr/src/pkg/manifests/driver-network-chxge.mf b/usr/src/pkg/manifests/driver-network-chxge.mf index 88e75cbd17..46cd862eb8 100644 --- a/usr/src/pkg/manifests/driver-network-chxge.mf +++ b/usr/src/pkg/manifests/driver-network-chxge.mf @@ -44,12 +44,10 @@ driver name=chxge clone_perms="chxge 0666 root sys" perms="* 0666 root sys" \ alias=pci1425,a file path=kernel/drv/$(ARCH64)/chxge group=sys $(i386_ONLY)file path=kernel/drv/chxge group=sys -legacy pkg=SUNWchxge arch=$(ARCH) category=system \ +legacy pkg=SUNWchxge \ desc="Chelsio N110 10 Gigabit Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Chelsio N110 10GE NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Chelsio N110 10GE NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/chxge/com/THIRDPARTYLICENSE \ - license=uts/common/io/chxge/com/THIRDPARTYLICENSE +license usr/src/uts/common/io/chxge/com/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/chxge/com/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-dmfe.mf b/usr/src/pkg/manifests/driver-network-dmfe.mf index c003df50bc..e825c02e67 100644 --- a/usr/src/pkg/manifests/driver-network-dmfe.mf +++ b/usr/src/pkg/manifests/driver-network-dmfe.mf @@ -45,10 +45,7 @@ driver name=dmfe clone_perms="dmfe 0666 root sys" perms="* 0666 root sys" \ alias=pci128h,9102 file path=kernel/drv/$(ARCH64)/dmfe group=sys $(i386_ONLY)file path=kernel/drv/dmfe group=sys -legacy pkg=SUNWdmfe arch=$(ARCH) category=system \ - desc="Davicom 9102 Fast Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Davicom 9102 Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWdmfe desc="Davicom 9102 Fast Ethernet Network Adapter Driver" \ + name="Davicom 9102 Fast Ethernet Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-e1000g.mf b/usr/src/pkg/manifests/driver-network-e1000g.mf index 3a817bee4b..19f42f703f 100644 --- a/usr/src/pkg/manifests/driver-network-e1000g.mf +++ b/usr/src/pkg/manifests/driver-network-e1000g.mf @@ -187,11 +187,7 @@ 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 -legacy pkg=SUNWintgige arch=$(ARCH) category=system \ - desc="Intel(R) PRO/1000 Server Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Intel(R) PRO/1000 Server Adapter Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cr_Intel.SUNWintgige license=cr_Intel -license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL +legacy pkg=SUNWintgige desc="Intel(R) PRO/1000 Server Adapter Driver" \ + name="Intel(R) PRO/1000 Server Adapter Driver" +license usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-elxl.mf b/usr/src/pkg/manifests/driver-network-elxl.mf index a5e2697c1e..43dde2a6ec 100644 --- a/usr/src/pkg/manifests/driver-network-elxl.mf +++ b/usr/src/pkg/manifests/driver-network-elxl.mf @@ -56,12 +56,7 @@ driver name=elxl clone_perms="elxl 0666 root sys" perms="* 0666 root sys" \ alias=pci10b7,9805 file path=kernel/drv/$(ARCH64)/elxl group=sys file path=kernel/drv/elxl group=sys -legacy pkg=SUNWelxl arch=$(ARCH) category=system \ - desc="3Com Etherlink XL Ethernet Driver" \ - hotline="Please contact your local service provider" \ - name="3Com Etherlink XL Ethernet 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/io/elxl/THIRDPARTYLICENSE \ - license=uts/common/io/elxl/THIRDPARTYLICENSE +legacy pkg=SUNWelxl desc="3Com Etherlink XL Ethernet Driver" \ + name="3Com Etherlink XL Ethernet Driver" +license usr/src/uts/common/io/elxl/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/elxl/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-emlxs.mf b/usr/src/pkg/manifests/driver-network-emlxs.mf index 5620bc6706..52fe4d49af 100644 --- a/usr/src/pkg/manifests/driver-network-emlxs.mf +++ b/usr/src/pkg/manifests/driver-network-emlxs.mf @@ -81,14 +81,14 @@ 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 \ +legacy pkg=SUNWemlxs \ desc="Device driver kit for Emulex-Sun FC, FCoE, and NIC adapters" \ - hotline="Please contact your local service provider" \ name="Emulex-Sun driver kit for Fibre Channel and Converged Network Adapters (root)" \ - vendor="Emulex Corporation" version=11.11,REV=2009.11.11 -legacy pkg=SUNWemlxu arch=$(ARCH) category=system \ + vendor="Emulex Corporation" +legacy pkg=SUNWemlxu \ desc="Support software for Emulex-Sun LightPulse Fibre Channel adapters" \ - hotline="Please contact your local service provider" \ name="Emulex-Sun LightPulse Fibre Channel Adapter Utilties (usr)" \ - vendor="Emulex Corporation" version=11.11,REV=2009.11.11 -license lic_Emulex license=lic_Emulex + vendor="Emulex Corporation" +license lic_CDDL license=lic_CDDL +license usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE \ + license=usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE diff --git a/usr/src/pkg/manifests/driver-network-eoib.mf b/usr/src/pkg/manifests/driver-network-eoib.mf new file mode 100644 index 0000000000..cabb6c6488 --- /dev/null +++ b/usr/src/pkg/manifests/driver-network-eoib.mf @@ -0,0 +1,49 @@ +# +# 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. +# + +# +# 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/eoib@$(PKGVERS) +set name=pkg.description value="Solaris Drivers for Ethernet over InfiniBand" +set name=pkg.summary value="Solaris Ethernet over InfiniBand" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware +set name=variant.arch value=$(ARCH) +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +driver name=eibnx perms="* 0666 root sys" +driver name=eoib clone_perms="eoib 0666 root sys" perms="* 0666 root sys" +file path=kernel/drv/$(ARCH64)/eibnx group=sys +file path=kernel/drv/$(ARCH64)/eoib group=sys +$(i386_ONLY)file path=kernel/drv/eibnx group=sys +file path=kernel/drv/eibnx.conf group=sys +$(i386_ONLY)file path=kernel/drv/eoib group=sys +license cr_Sun license=cr_Sun +license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-eri.mf b/usr/src/pkg/manifests/driver-network-eri.mf index e783c6fe2e..62d1ed86a5 100644 --- a/usr/src/pkg/manifests/driver-network-eri.mf +++ b/usr/src/pkg/manifests/driver-network-eri.mf @@ -40,10 +40,7 @@ dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=eri alias=pci108e,1101 clone_perms="eri 0666 root sys" file path=kernel/drv/$(ARCH64)/eri group=sys -legacy pkg=SUNWerid arch=$(ARCH) category=system \ - desc="Sun RIO 10/100 Mb Ethernet Drivers" \ - hotline="Please contact your local service provider" \ - name="Sun RIO 10/100 Mb Ethernet Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWerid desc="Sun RIO 10/100 Mb Ethernet Drivers" \ + name="Sun RIO 10/100 Mb Ethernet Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fcip.mf b/usr/src/pkg/manifests/driver-network-fcip.mf index e287a4f647..3675be9aa6 100644 --- a/usr/src/pkg/manifests/driver-network-fcip.mf +++ b/usr/src/pkg/manifests/driver-network-fcip.mf @@ -42,10 +42,7 @@ 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 -legacy pkg=SUNWfcip arch=$(ARCH) category=system \ - desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \ - hotline="Please contact your local service provider" \ - name="Sun FCIP IP/ARP over FibreChannel Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWfcip desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \ + name="Sun FCIP IP/ARP over FibreChannel Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fcoe.mf b/usr/src/pkg/manifests/driver-network-fcoe.mf index d1fe09a91b..ff4835d39a 100644 --- a/usr/src/pkg/manifests/driver-network-fcoe.mf +++ b/usr/src/pkg/manifests/driver-network-fcoe.mf @@ -43,10 +43,8 @@ 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 -legacy pkg=SUNWfcoe arch=$(ARCH) category=system \ +legacy pkg=SUNWfcoe \ desc="Sun FCoE (Fibre Channel over Ethernet) Transport Driver" \ - hotline="Please contact your local service provider" \ - name="Sun FCoE Transport Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun FCoE Transport Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fcoei.mf b/usr/src/pkg/manifests/driver-network-fcoei.mf index e587ff4094..54ef1b788a 100644 --- a/usr/src/pkg/manifests/driver-network-fcoei.mf +++ b/usr/src/pkg/manifests/driver-network-fcoei.mf @@ -43,10 +43,8 @@ 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 -legacy pkg=SUNWfcoei arch=$(ARCH) category=system \ +legacy pkg=SUNWfcoei \ desc="Sun FCoE (Fibre Channel over Ethernet) Initiator Driver" \ - hotline="Please contact your local service provider" \ - name="Sun FCoE Initiator Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun FCoE Initiator Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fcoet.mf b/usr/src/pkg/manifests/driver-network-fcoet.mf index 2126e89314..58710ad145 100644 --- a/usr/src/pkg/manifests/driver-network-fcoet.mf +++ b/usr/src/pkg/manifests/driver-network-fcoet.mf @@ -42,10 +42,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=fcoet perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/fcoet group=sys $(i386_ONLY)file path=kernel/drv/fcoet group=sys -legacy pkg=SUNWfcoet arch=$(ARCH) category=system \ +legacy pkg=SUNWfcoet \ desc="Sun FCoE (Fibre Channel over Ethernet) COMSTAR Driver" \ - hotline="Please contact your local service provider" \ - name="Sun FCoE COMSTAR Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun FCoE COMSTAR Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fcp.mf b/usr/src/pkg/manifests/driver-network-fcp.mf index a0b42f876c..755baf87cb 100644 --- a/usr/src/pkg/manifests/driver-network-fcp.mf +++ b/usr/src/pkg/manifests/driver-network-fcp.mf @@ -42,10 +42,7 @@ 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 -legacy pkg=SUNWfcp arch=$(ARCH) category=system \ - desc="Sun FCP SCSI Fibre Channel Device Driver" \ - hotline="Please contact your local service provider" \ - name="Sun FCP SCSI Device Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWfcp desc="Sun FCP SCSI Fibre Channel Device Driver" \ + name="Sun FCP SCSI Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fcsm.mf b/usr/src/pkg/manifests/driver-network-fcsm.mf index 4e27a80ac6..4984631445 100644 --- a/usr/src/pkg/manifests/driver-network-fcsm.mf +++ b/usr/src/pkg/manifests/driver-network-fcsm.mf @@ -42,9 +42,6 @@ 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 -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 +legacy pkg=SUNWfcsm desc="Provides the FCSM driver" name="FCSM driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-fp.mf b/usr/src/pkg/manifests/driver-network-fp.mf index c27cbf4cb5..8fed34b5d7 100644 --- a/usr/src/pkg/manifests/driver-network-fp.mf +++ b/usr/src/pkg/manifests/driver-network-fp.mf @@ -47,10 +47,7 @@ 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" \ - name="Sun Fibre Channel Transport layer" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWfctl desc="fctl module and fp device driver" \ + name="Sun Fibre Channel Transport layer" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-hermon.mf b/usr/src/pkg/manifests/driver-network-hermon.mf index d0f2cda141..6bc7705a34 100644 --- a/usr/src/pkg/manifests/driver-network-hermon.mf +++ b/usr/src/pkg/manifests/driver-network-hermon.mf @@ -47,9 +47,6 @@ driver name=hermon perms="* 0666 root sys" \ 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 -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." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWhermon desc="Hermon HCA driver" name="Sun IB Hermon HCA driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-hme.mf b/usr/src/pkg/manifests/driver-network-hme.mf index 8b793676bd..4a02c3d1b7 100644 --- a/usr/src/pkg/manifests/driver-network-hme.mf +++ b/usr/src/pkg/manifests/driver-network-hme.mf @@ -45,10 +45,7 @@ $(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" \ - hotline="Please contact your local service provider" \ - name="SunSwift Adapter Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWhmd desc="SunSwift Adapter Drivers" \ + name="SunSwift Adapter Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-hxge.mf b/usr/src/pkg/manifests/driver-network-hxge.mf index 77cf6c0667..768bb568e5 100644 --- a/usr/src/pkg/manifests/driver-network-hxge.mf +++ b/usr/src/pkg/manifests/driver-network-hxge.mf @@ -44,10 +44,7 @@ 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 -legacy pkg=SUNWhxge arch=$(ARCH) category=system \ - desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="SUN 10Gb hxge NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWhxge desc="SUN 10Gb hxge Ethernet Network Adapter Driver" \ + name="SUN 10Gb hxge NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-ib.mf b/usr/src/pkg/manifests/driver-network-ib.mf index 78083ab2fd..03b06c8cda 100644 --- a/usr/src/pkg/manifests/driver-network-ib.mf +++ b/usr/src/pkg/manifests/driver-network-ib.mf @@ -53,10 +53,8 @@ $(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." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWib desc="Sun InfiniBand Framework" \ + name="Sun InfiniBand Framework" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL diff --git a/usr/src/pkg/manifests/driver-network-ibdma.mf b/usr/src/pkg/manifests/driver-network-ibdma.mf index 062f4a2196..7e500dc9bd 100644 --- a/usr/src/pkg/manifests/driver-network-ibdma.mf +++ b/usr/src/pkg/manifests/driver-network-ibdma.mf @@ -40,10 +40,7 @@ dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys 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" \ - name="Sun InfiniBand Device Management Agent (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWibdmar desc="Sun InfiniBand Device Management Agent (Root)" \ + name="Sun InfiniBand Device Management Agent (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-ibp.mf b/usr/src/pkg/manifests/driver-network-ibp.mf index 3cb506f708..142b562423 100644 --- a/usr/src/pkg/manifests/driver-network-ibp.mf +++ b/usr/src/pkg/manifests/driver-network-ibp.mf @@ -54,10 +54,7 @@ file path=lib/svc/manifest/network/ibd-post-upgrade.xml group=sys mode=0444 file path=lib/svc/method/ibd-post-upgrade mode=0555 file path=sbin/ibd_delete_link mode=0555 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 +legacy pkg=SUNWipoib desc="Sun IP over InfiniBand" \ + name="Sun IP over InfiniBand" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-igb.mf b/usr/src/pkg/manifests/driver-network-igb.mf index c2828377b3..f171927946 100644 --- a/usr/src/pkg/manifests/driver-network-igb.mf +++ b/usr/src/pkg/manifests/driver-network-igb.mf @@ -58,10 +58,7 @@ 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 -legacy pkg=SUNWigb arch=$(ARCH) category=system \ - desc="Intel 82575 1Gb PCI Express NIC Driver" \ - hotline="Please contact your local service provider" \ - name="Intel 82575 1Gb PCI Express NIC Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWigb desc="Intel 82575 1Gb PCI Express NIC Driver" \ + name="Intel 82575 1Gb PCI Express NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-ipw.mf b/usr/src/pkg/manifests/driver-network-ipw.mf index ca32812e4f..14f97a4f5b 100644 --- a/usr/src/pkg/manifests/driver-network-ipw.mf +++ b/usr/src/pkg/manifests/driver-network-ipw.mf @@ -42,13 +42,10 @@ driver name=ipw alias=pci8086,1043 clone_perms="ipw 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/ipw group=sys file path=kernel/drv/ipw group=sys -legacy pkg=SUNWipw arch=$(ARCH) category=system \ - desc="Intel Pro. Wirless 802.11b IPW2100B Driver" \ - hotline="Please contact your local service provider" \ - name="Intel Pro. Wireless 802.11b IPW2100B Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWipw desc="Intel Pro. Wirless 802.11b IPW2100B Driver" \ + name="Intel Pro. Wireless 802.11b IPW2100B Driver" license cr_Sun license=cr_Sun -license uts/common/io/ipw/THIRDPARTYLICENSE \ - license=uts/common/io/ipw/THIRDPARTYLICENSE -license uts/common/io/ipw/fw-ipw2100/LICENSE \ - license=uts/common/io/ipw/fw-ipw2100/LICENSE +license usr/src/uts/common/io/ipw/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ipw/THIRDPARTYLICENSE +license usr/src/uts/common/io/ipw/fw-ipw2100/LICENSE \ + license=usr/src/uts/common/io/ipw/fw-ipw2100/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-iwh.mf b/usr/src/pkg/manifests/driver-network-iwh.mf index 5d4528df97..e965821da7 100644 --- a/usr/src/pkg/manifests/driver-network-iwh.mf +++ b/usr/src/pkg/manifests/driver-network-iwh.mf @@ -50,15 +50,12 @@ driver name=iwh clone_perms="iwh 0666 root sys" perms="* 0666 root sys" \ alias=pciex8086,423d file path=kernel/drv/$(ARCH64)/iwh group=sys 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 +legacy pkg=SUNWiwh desc="Intel(R) WiFi Link 5100/5300 driver" \ + name="Intel(R) WiFi Link 5100/5300 driver" license cr_Sun license=cr_Sun -license uts/common/io/iwh/THIRDPARTYLICENSE \ - license=uts/common/io/iwh/THIRDPARTYLICENSE -license uts/common/io/iwh/fw-iw/fw_5000/LICENSE \ - license=uts/common/io/iwh/fw-iw/fw_5000/LICENSE -license uts/common/io/iwh/fw-iw/fw_5150/LICENSE \ - license=uts/common/io/iwh/fw-iw/fw_5150/LICENSE +license usr/src/uts/common/io/iwh/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/iwh/THIRDPARTYLICENSE +license usr/src/uts/common/io/iwh/fw-iw/fw_5000/LICENSE \ + license=usr/src/uts/common/io/iwh/fw-iw/fw_5000/LICENSE +license usr/src/uts/common/io/iwh/fw-iw/fw_5150/LICENSE \ + license=usr/src/uts/common/io/iwh/fw-iw/fw_5150/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-iwi.mf b/usr/src/pkg/manifests/driver-network-iwi.mf index d7428b1656..dac40d9cf1 100644 --- a/usr/src/pkg/manifests/driver-network-iwi.mf +++ b/usr/src/pkg/manifests/driver-network-iwi.mf @@ -50,13 +50,11 @@ driver name=iwi clone_perms="iwi 0666 root sys" perms="* 0666 root sys" \ alias=pci8086,4224.8086.1011 file path=kernel/drv/$(ARCH64)/iwi group=sys file path=kernel/drv/iwi group=sys -legacy pkg=SUNWiwi arch=$(ARCH) category=system \ +legacy pkg=SUNWiwi \ desc="Intel Pro. Wirless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" \ - hotline="Please contact your local service provider" \ - name="Intel Pro. Wireless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Intel Pro. Wireless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" license cr_Sun license=cr_Sun -license uts/common/io/iwi/THIRDPARTYLICENSE \ - license=uts/common/io/iwi/THIRDPARTYLICENSE -license uts/common/io/iwi/fw-ipw2200/LICENSE \ - license=uts/common/io/iwi/fw-ipw2200/LICENSE +license usr/src/uts/common/io/iwi/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/iwi/THIRDPARTYLICENSE +license usr/src/uts/common/io/iwi/fw-ipw2200/LICENSE \ + license=usr/src/uts/common/io/iwi/fw-ipw2200/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-iwk.mf b/usr/src/pkg/manifests/driver-network-iwk.mf index cc4440a729..19ec6110e9 100644 --- a/usr/src/pkg/manifests/driver-network-iwk.mf +++ b/usr/src/pkg/manifests/driver-network-iwk.mf @@ -43,13 +43,10 @@ driver name=iwk clone_perms="iwk 0666 root sys" perms="* 0666 root sys" \ alias=pciex8086,4230 file path=kernel/drv/$(ARCH64)/iwk group=sys 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 +legacy pkg=SUNWiwk desc="Intel(R) PRO/Wireless 4965AGN driver" \ + name="Intel(R) PRO/Wireless 4965AGN driver" 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 usr/src/uts/common/io/iwk/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/iwk/THIRDPARTYLICENSE +license usr/src/uts/common/io/iwk/fw-iw/LICENSE \ + license=usr/src/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 2cde5defb8..eb1a8cd6a7 100644 --- a/usr/src/pkg/manifests/driver-network-iwp.mf +++ b/usr/src/pkg/manifests/driver-network-iwp.mf @@ -47,13 +47,10 @@ driver name=iwp clone_perms="iwp 0666 root sys" perms="* 0666 root sys" \ alias=pciex8086,4239 file path=kernel/drv/$(ARCH64)/iwp group=sys file path=kernel/drv/iwp group=sys -legacy pkg=SUNWiwp arch=$(ARCH) category=system \ - desc="Intel(R) WiFi Link 6000 series driver" \ - hotline="Please contact your local service provider" \ - name="Intel(R) WiFi Link 6000 series driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWiwp desc="Intel(R) WiFi Link 6000 series driver" \ + name="Intel(R) WiFi Link 6000 series driver" 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 usr/src/uts/common/io/iwp/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/iwp/THIRDPARTYLICENSE +license usr/src/uts/common/io/iwp/fw-iw/LICENSE \ + license=usr/src/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 6657fe6387..4f8597f380 100644 --- a/usr/src/pkg/manifests/driver-network-ixgb.mf +++ b/usr/src/pkg/manifests/driver-network-ixgb.mf @@ -45,14 +45,11 @@ driver name=ixgb perms="* 0666 root root" \ alias=pci8086,a11f file path=kernel/drv/$(ARCH64)/ixgb group=sys $(i386_ONLY)file path=kernel/drv/ixgb group=sys -legacy pkg=SUNWixgb arch=$(ARCH) category=system \ - desc="Intel(R) PRO/10G Server Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Intel(R) PRO/10G Server Adapter Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWixgb desc="Intel(R) PRO/10G Server Adapter Driver" \ + name="Intel(R) PRO/10G Server Adapter Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble -license uts/common/io/ixgbe/THIRDPARTYLICENSE \ - license=uts/common/io/ixgbe/THIRDPARTYLICENSE +license usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-ixgbe.mf b/usr/src/pkg/manifests/driver-network-ixgbe.mf index c78ec79f36..5da492ee16 100644 --- a/usr/src/pkg/manifests/driver-network-ixgbe.mf +++ b/usr/src/pkg/manifests/driver-network-ixgbe.mf @@ -52,24 +52,21 @@ driver name=ixgbe clone_perms="ixgbe 0666 root sys" perms="* 0666 root sys" \ alias=pciex8086,10f7 \ alias=pciex8086,10f8 \ alias=pciex8086,10f9 \ - alias=pciex8086,10fa \ alias=pciex8086,10fb \ alias=pciex8086,10fc \ alias=pciex8086,1507 \ alias=pciex8086,1508 \ alias=pciex8086,150b \ alias=pciex8086,1514 \ - alias=pciex8086,1517 + alias=pciex8086,1517 \ + alias=pciex8086,151c 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 -legacy pkg=SUNWixgbe arch=$(ARCH) category=system \ - desc="Intel 10GbE PCIE NIC Driver" \ - hotline="Please contact your local service provider" \ - name="Intel 10GbE PCIE NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWixgbe desc="Intel 10GbE PCIE NIC Driver" \ + name="Intel 10GbE PCIE NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/ixgbe/THIRDPARTYLICENSE \ - license=uts/common/io/ixgbe/THIRDPARTYLICENSE +license usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-mwl.mf b/usr/src/pkg/manifests/driver-network-mwl.mf index 83bfefa798..28b9ce84e4 100644 --- a/usr/src/pkg/manifests/driver-network-mwl.mf +++ b/usr/src/pkg/manifests/driver-network-mwl.mf @@ -49,12 +49,10 @@ 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 file path=kernel/misc/mwlfw group=sys mode=0755 -legacy pkg=SUNWmwl arch=$(ARCH) category=system \ +legacy pkg=SUNWmwl \ desc="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \ - hotline="Please contact your local service provider" \ - name="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license uts/common/io/mwl/THIRDPARTYLICENSE \ - license=uts/common/io/mwl/THIRDPARTYLICENSE -license uts/common/io/mwl/mwl_fw/LICENSE \ - license=uts/common/io/mwl/mwl_fw/LICENSE + name="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" +license usr/src/uts/common/io/mwl/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/mwl/THIRDPARTYLICENSE +license usr/src/uts/common/io/mwl/mwl_fw/LICENSE \ + license=usr/src/uts/common/io/mwl/mwl_fw/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-mxfe.mf b/usr/src/pkg/manifests/driver-network-mxfe.mf index 4a9a97122d..29de9addd6 100644 --- a/usr/src/pkg/manifests/driver-network-mxfe.mf +++ b/usr/src/pkg/manifests/driver-network-mxfe.mf @@ -45,11 +45,8 @@ driver name=mxfe clone_perms="mxfe 0666 root sys" perms="* 0666 root sys" \ alias=pci11fc,9881 file path=kernel/drv/$(ARCH64)/mxfe group=sys $(i386_ONLY)file path=kernel/drv/mxfe group=sys -legacy pkg=SUNWmxfe arch=$(ARCH) category=system \ - desc="Macronix Fast Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Macronix Fast Ethernet Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWmxfe desc="Macronix Fast Ethernet Network Adapter Driver" \ + name="Macronix Fast Ethernet Driver" license cr_Sun license=cr_Sun -license uts/common/io/mxfe/THIRDPARTYLICENSE \ - license=uts/common/io/mxfe/THIRDPARTYLICENSE +license usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/mxfe/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-myri10ge.mf b/usr/src/pkg/manifests/driver-network-myri10ge.mf index 1f8caf0933..02b7756bdf 100644 --- a/usr/src/pkg/manifests/driver-network-myri10ge.mf +++ b/usr/src/pkg/manifests/driver-network-myri10ge.mf @@ -46,12 +46,9 @@ driver name=myri10ge clone_perms="myri10ge 0666 root sys" \ alias=pciex14c1,9 file path=kernel/drv/$(ARCH64)/myri10ge group=sys $(i386_ONLY)file path=kernel/drv/myri10ge group=sys -legacy pkg=SUNWmyri10ge arch=$(ARCH) category=system \ - desc="Myricom 10 Gigabit Ethernet Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Myricom 10Gb NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWmyri10ge desc="Myricom 10 Gigabit Ethernet Adapter Driver" \ + name="Myricom 10Gb NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/myri10ge/THIRDPARTYLICENSE \ - license=uts/common/io/myri10ge/THIRDPARTYLICENSE +license usr/src/uts/common/io/myri10ge/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/myri10ge/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-nge.mf b/usr/src/pkg/manifests/driver-network-nge.mf index 84f9bfa9db..84e43ce02d 100644 --- a/usr/src/pkg/manifests/driver-network-nge.mf +++ b/usr/src/pkg/manifests/driver-network-nge.mf @@ -56,9 +56,7 @@ driver name=nge clone_perms="nge 0666 root sys" perms="* 0666 root sys" \ file path=kernel/drv/$(ARCH64)/nge group=sys file path=kernel/drv/nge group=sys 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." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWnge desc="Nvidia CK8-04 GE driver" \ + name="Nvidia CK8-04 GE driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-niumx.mf b/usr/src/pkg/manifests/driver-network-niumx.mf index bb982c7665..1538884a04 100644 --- a/usr/src/pkg/manifests/driver-network-niumx.mf +++ b/usr/src/pkg/manifests/driver-network-niumx.mf @@ -41,10 +41,8 @@ dir path=platform/sun4v/kernel/drv group=sys dir path=platform/sun4v/kernel/drv/$(ARCH64) group=sys driver name=niumx alias=SUNW,niumx perms="* 0666 root sys" file path=platform/sun4v/kernel/drv/$(ARCH64)/niumx group=sys -legacy pkg=SUNWniumx.v arch=$(ARCH).sun4v category=system \ +legacy pkg=SUNWniumx.v arch=$(ARCH).sun4v \ desc="UltraSPARC-T2 NIU nexus driver" \ - hotline="Please contact your local service provider" \ - name="UltraSPARC-T2 NIU nexus driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="UltraSPARC-T2 NIU nexus driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-ntxn.mf b/usr/src/pkg/manifests/driver-network-ntxn.mf index 9d6d545d98..314779fa81 100644 --- a/usr/src/pkg/manifests/driver-network-ntxn.mf +++ b/usr/src/pkg/manifests/driver-network-ntxn.mf @@ -50,12 +50,9 @@ driver name=ntxn \ file path=kernel/drv/$(ARCH64)/ntxn group=sys file path=kernel/drv/ntxn group=sys 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" \ - name="NetXen 1Gb/10Gb NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWntxn desc="NetXen 1Gb/10Gb Ethernet Adapter Driver" \ + name="NetXen 1Gb/10Gb NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/ntxn/THIRDPARTYLICENSE \ - license=uts/common/io/ntxn/THIRDPARTYLICENSE +license usr/src/uts/common/io/ntxn/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ntxn/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-nxge.mf b/usr/src/pkg/manifests/driver-network-nxge.mf index 4119b0eae8..bb2fd7e463 100644 --- a/usr/src/pkg/manifests/driver-network-nxge.mf +++ b/usr/src/pkg/manifests/driver-network-nxge.mf @@ -68,20 +68,11 @@ $(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 -$(i386_ONLY)legacy pkg=SUNWnxge arch=$(ARCH) category=system \ - desc="Sun NIU 10Gb/1Gb leaf driver" \ - hotline="Please contact your local service provider" \ - name="Sun NIU leaf driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWnxge.u arch=$(ARCH).sun4u category=system \ - desc="Sun NIU 10Gb/1Gb driver" \ - hotline="Please contact your local service provider" \ - name="Sun NIU leaf driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWnxge.v arch=$(ARCH).sun4v category=system \ - desc="Sun NIU leaf driver" \ - hotline="Please contact your local service provider" \ - name="Sun NIU leaf driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +$(i386_ONLY)legacy pkg=SUNWnxge desc="Sun NIU 10Gb/1Gb leaf driver" \ + name="Sun NIU leaf driver" +$(sparc_ONLY)legacy pkg=SUNWnxge.u arch=$(ARCH).sun4u \ + desc="Sun NIU 10Gb/1Gb driver" name="Sun NIU leaf driver" +$(sparc_ONLY)legacy pkg=SUNWnxge.v arch=$(ARCH).sun4v \ + desc="Sun NIU leaf driver" name="Sun NIU leaf driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-ofk.mf b/usr/src/pkg/manifests/driver-network-ofk.mf index a94807e857..b5166d6136 100644 --- a/usr/src/pkg/manifests/driver-network-ofk.mf +++ b/usr/src/pkg/manifests/driver-network-ofk.mf @@ -42,16 +42,20 @@ dir path=kernel/drv/$(ARCH64) group=sys dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys driver name=sol_ucma perms="* 0666 root sys" +driver name=sol_umad perms="* 0666 root sys" driver name=sol_uverbs perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/sol_ucma group=sys +file path=kernel/drv/$(ARCH64)/sol_umad 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_ucma.conf group=sys +$(i386_ONLY)file path=kernel/drv/sol_umad group=sys +file path=kernel/drv/sol_umad.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 license lic_CDDL license=lic_CDDL -license uts/common/io/ib/clients/of/lic_of \ - license=uts/common/io/ib/clients/of/lic_of +license usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-pcan.mf b/usr/src/pkg/manifests/driver-network-pcan.mf index f746132cbf..01593e3142 100644 --- a/usr/src/pkg/manifests/driver-network-pcan.mf +++ b/usr/src/pkg/manifests/driver-network-pcan.mf @@ -45,10 +45,7 @@ driver name=pcan clone_perms="pcan 0666 root sys" perms="* 0666 root sys" \ alias=pci14b9,a504 file path=kernel/drv/$(ARCH64)/pcan group=sys $(i386_ONLY)file path=kernel/drv/pcan group=sys -legacy pkg=SUNWpcan arch=$(ARCH) category=system \ - desc="Cisco-Aironet 802.11b driver" \ - hotline="Please contact your local service provider" \ - name="Cisco-Aironet 802.11b driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license uts/common/io/pcan/THIRDPARTYLICENSE \ - license=uts/common/io/pcan/THIRDPARTYLICENSE +legacy pkg=SUNWpcan desc="Cisco-Aironet 802.11b driver" \ + name="Cisco-Aironet 802.11b driver" +license usr/src/uts/common/io/pcan/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/pcan/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-pcwl.mf b/usr/src/pkg/manifests/driver-network-pcwl.mf index 657093b2dd..7900aaa7d4 100644 --- a/usr/src/pkg/manifests/driver-network-pcwl.mf +++ b/usr/src/pkg/manifests/driver-network-pcwl.mf @@ -47,10 +47,7 @@ driver name=pcwl clone_perms="pcwl 0666 root sys" perms="* 0666 root sys" \ alias=pci1385,4105 file path=kernel/drv/$(ARCH64)/pcwl group=sys $(i386_ONLY)file path=kernel/drv/pcwl group=sys -legacy pkg=SUNWpcwl arch=$(ARCH) category=system \ - desc="Lucent/PRISM-II 802.11b driver" \ - hotline="Please contact your local service provider" \ - name="Lucent/PRISM-II 802.11b driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license uts/common/io/pcwl/THIRDPARTYLICENSE \ - license=uts/common/io/pcwl/THIRDPARTYLICENSE +legacy pkg=SUNWpcwl desc="Lucent/PRISM-II 802.11b driver" \ + name="Lucent/PRISM-II 802.11b driver" +license usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/pcwl/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-platform.mf b/usr/src/pkg/manifests/driver-network-platform.mf index de4aa52ff5..86476fe023 100644 --- a/usr/src/pkg/manifests/driver-network-platform.mf +++ b/usr/src/pkg/manifests/driver-network-platform.mf @@ -181,14 +181,13 @@ 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 -legacy pkg=SUNWos86r arch=$(ARCH) category=system \ - desc="Platform Support, OS Functionality (Root)" \ - hotline="Please contact your local service provider" \ - name="Platform Support, OS Functionality (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWos86r desc="Platform Support, OS Functionality (Root)" \ + name="Platform Support, OS Functionality (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble +license usr/closed/uts/intel/io/iprb/THIRDPARTYLICENSE \ + license=usr/closed/uts/intel/io/iprb/THIRDPARTYLICENSE # elxl moved out of this package, so create a dependency for upgraded systems depend fmri=driver/network/elxl type=require diff --git a/usr/src/pkg/manifests/driver-network-qfe.mf b/usr/src/pkg/manifests/driver-network-qfe.mf index 4338d03b76..006786cc39 100644 --- a/usr/src/pkg/manifests/driver-network-qfe.mf +++ b/usr/src/pkg/manifests/driver-network-qfe.mf @@ -40,10 +40,7 @@ dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=qfe alias=SUNW,qfe 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 +legacy pkg=SUNWqfed desc="Sun Quad FastEtherent PCI/SBus Adapter" \ + name="Sun Quad FastEthernet Adapter Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-qlc.mf b/usr/src/pkg/manifests/driver-network-qlc.mf index 7905b8e43d..3cb663e1cc 100644 --- a/usr/src/pkg/manifests/driver-network-qlc.mf +++ b/usr/src/pkg/manifests/driver-network-qlc.mf @@ -83,11 +83,10 @@ $(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 \ +legacy pkg=SUNWqlc \ desc="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" \ - hotline="Please contact your local service provider" \ - name="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_Qlogic license=lic_Qlogic +license usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE \ + license=usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE diff --git a/usr/src/pkg/manifests/driver-network-ral.mf b/usr/src/pkg/manifests/driver-network-ral.mf index 4600abb8c2..97b2fbe459 100644 --- a/usr/src/pkg/manifests/driver-network-ral.mf +++ b/usr/src/pkg/manifests/driver-network-ral.mf @@ -42,10 +42,7 @@ driver name=ral alias=pci1814,201 clone_perms="ral 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/ral group=sys file path=kernel/drv/ral group=sys -legacy pkg=SUNWralink arch=$(ARCH) category=system \ - desc="Ralink RT2500 802.11b/g Wireless Driver" \ - hotline="Please contact your local service provider" \ - name="Ralink RT2500 802.11b/g Wireless Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license uts/common/io/ral/THIRDPARTYLICENSE \ - license=uts/common/io/ral/THIRDPARTYLICENSE +legacy pkg=SUNWralink desc="Ralink RT2500 802.11b/g Wireless Driver" \ + name="Ralink RT2500 802.11b/g Wireless Driver" +license usr/src/uts/common/io/ral/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ral/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-rds.mf b/usr/src/pkg/manifests/driver-network-rds.mf index 7fcfa0a07d..252b1ede5a 100644 --- a/usr/src/pkg/manifests/driver-network-rds.mf +++ b/usr/src/pkg/manifests/driver-network-rds.mf @@ -35,21 +35,21 @@ set name=pkg.summary value="Sun Reliable Datagram Sockets" set name=info.classification \ value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) +dir path=etc group=sys +dir path=etc/sock2path.d group=sys dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=rds perms="* 0644 root sys" driver name=rdsib perms="* 0644 root sys" +file path=etc/sock2path.d/driver%2Fnetwork%2Frds group=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 $(i386_ONLY)file path=kernel/drv/rdsib group=sys 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" \ - name="Sun Reliable Datagram Sockets" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license uts/common/io/ib/clients/rds/THIRDPARTYLICENSE \ - license=uts/common/io/ib/clients/rds/THIRDPARTYLICENSE +legacy pkg=SUNWrds desc="Sun Reliable Datagram Sockets" \ + name="Sun Reliable Datagram Sockets" +license usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ib/clients/rds/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-rdsv3.mf b/usr/src/pkg/manifests/driver-network-rdsv3.mf index 7685eb53f2..060c86a4ad 100644 --- a/usr/src/pkg/manifests/driver-network-rdsv3.mf +++ b/usr/src/pkg/manifests/driver-network-rdsv3.mf @@ -33,8 +33,11 @@ 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.summary value="Solaris 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) +dir path=etc group=sys +dir path=etc/sock2path.d group=sys dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -45,6 +48,7 @@ dir path=usr/lib group=bin dir path=usr/lib/rcm group=bin dir path=usr/lib/rcm/scripts group=bin driver name=rdsv3 perms="* 0644 root sys" +file path=etc/sock2path.d/driver%2Fnetwork%2Frdsv3 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 @@ -53,5 +57,5 @@ $(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 \ - license=uts/common/io/ib/clients/rdsv3/LICENSE +license usr/src/uts/common/io/ib/clients/rdsv3/LICENSE \ + license=usr/src/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 89072ae964..e0692f757b 100644 --- a/usr/src/pkg/manifests/driver-network-rge.mf +++ b/usr/src/pkg/manifests/driver-network-rge.mf @@ -48,10 +48,7 @@ driver name=rge clone_perms="rge 0666 root sys" perms="* 0666 root sys" \ alias=pciex10ec,8136 file path=kernel/drv/$(ARCH64)/rge group=sys $(i386_ONLY)file path=kernel/drv/rge group=sys -legacy pkg=SUNWrge arch=$(ARCH) category=system \ - desc="Realtek Gigabit Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Realtek Gigabit Ethernet Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWrge desc="Realtek Gigabit Ethernet Network Adapter Driver" \ + name="Realtek Gigabit Ethernet Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-rpcib.mf b/usr/src/pkg/manifests/driver-network-rpcib.mf index c926134ad3..fe49e99147 100644 --- a/usr/src/pkg/manifests/driver-network-rpcib.mf +++ b/usr/src/pkg/manifests/driver-network-rpcib.mf @@ -44,10 +44,7 @@ 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 -legacy pkg=SUNWrpcib arch=$(ARCH) category=system \ - desc="InfiniBand plugin implementation of RPC over RDMA" \ - hotline="Please contact your local service provider" \ - name="InfiniBand plugin to RPC over RDMA" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWrpcib desc="InfiniBand plugin implementation of RPC over RDMA" \ + name="InfiniBand plugin to RPC over RDMA" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-rtls.mf b/usr/src/pkg/manifests/driver-network-rtls.mf index 0487a7a008..8bc710df18 100644 --- a/usr/src/pkg/manifests/driver-network-rtls.mf +++ b/usr/src/pkg/manifests/driver-network-rtls.mf @@ -45,9 +45,6 @@ driver name=rtls clone_perms="rtls 0666 root sys" perms="* 0666 root sys" \ alias=pci1186,1301 file path=kernel/drv/$(ARCH64)/rtls group=sys $(i386_ONLY)file path=kernel/drv/rtls group=sys -legacy pkg=SUNWrtls arch=$(ARCH) category=system desc="RTL Fast NIC" \ - hotline="Please contact your local service provider" \ - name="REALTEK Fast NIC" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWrtls desc="RTL Fast NIC" name="REALTEK Fast NIC" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-rtw.mf b/usr/src/pkg/manifests/driver-network-rtw.mf index 822a6f9170..8c96f810b0 100644 --- a/usr/src/pkg/manifests/driver-network-rtw.mf +++ b/usr/src/pkg/manifests/driver-network-rtw.mf @@ -42,10 +42,7 @@ driver name=rtw alias=pci10ec,8180 clone_perms="rtw 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/rtw group=sys file path=kernel/drv/rtw group=sys -legacy pkg=SUNWrtw arch=$(ARCH) category=system \ - desc="realtek 8180L 802.11b driver" \ - hotline="Please contact your local service provider" \ - name="realtek 8180L 802.11b driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license uts/common/io/rtw/THIRDPARTYLICENSE \ - license=uts/common/io/rtw/THIRDPARTYLICENSE +legacy pkg=SUNWrtw desc="realtek 8180L 802.11b driver" \ + name="realtek 8180L 802.11b driver" +license usr/src/uts/common/io/rtw/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/rtw/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-rum.mf b/usr/src/pkg/manifests/driver-network-rum.mf index 660c9d66d7..8f3ccb5a34 100644 --- a/usr/src/pkg/manifests/driver-network-rum.mf +++ b/usr/src/pkg/manifests/driver-network-rum.mf @@ -50,11 +50,9 @@ driver name=rum clone_perms="rum 0666 root sys" perms="* 0666 root sys" \ alias=usbb05,1723 file path=kernel/drv/$(ARCH64)/rum group=sys file path=kernel/drv/rum group=sys -legacy pkg=SUNWrum arch=$(ARCH) category=system \ +legacy pkg=SUNWrum \ desc="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" \ - hotline="Please contact your local service provider" \ - name="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" license cr_Sun license=cr_Sun -license uts/common/io/rum/THIRDPARTYLICENSE \ - license=uts/common/io/rum/THIRDPARTYLICENSE +license usr/src/uts/common/io/rum/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/rum/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-rwd.mf b/usr/src/pkg/manifests/driver-network-rwd.mf index 7a63f28101..ffef469bb8 100644 --- a/usr/src/pkg/manifests/driver-network-rwd.mf +++ b/usr/src/pkg/manifests/driver-network-rwd.mf @@ -44,10 +44,8 @@ driver name=rwd alias=pci1814,401 clone_perms="rwd 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/rwd group=sys file path=kernel/drv/rwd group=sys -legacy pkg=SUNWrwd arch=$(ARCH) category=system \ +legacy pkg=SUNWrwd \ desc="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" \ - hotline="Please contact your local service provider" \ - name="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license uts/common/io/rwd/THIRDPARTYLICENSE \ - license=uts/common/io/rwd/THIRDPARTYLICENSE + name="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" +license usr/src/uts/common/io/rwd/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/rwd/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-rwn.mf b/usr/src/pkg/manifests/driver-network-rwn.mf index 20e760b5d9..069b9daead 100644 --- a/usr/src/pkg/manifests/driver-network-rwn.mf +++ b/usr/src/pkg/manifests/driver-network-rwn.mf @@ -44,12 +44,10 @@ driver name=rwn alias=pci1814,781 clone_perms="rwn 0666 root sys" \ perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/rwn group=sys file path=kernel/drv/rwn group=sys -legacy pkg=SUNWrwn arch=$(ARCH) category=system \ +legacy pkg=SUNWrwn \ desc="Ralink RT2700/RT2800 IEEE802.11 a/b/g/n Wireless Network Device" \ - hotline="Please contact your local service provider" \ - name="Ralink RT2700/2800 IEEE802.11 a/b/g/n Wireless Network Device" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license uts/common/io/rwn/THIRDPARTYLICENSE \ - license=uts/common/io/rwn/THIRDPARTYLICENSE -license uts/common/io/rwn/fw-rt2860/LICENSE \ - license=uts/common/io/rwn/fw-rt2860/LICENSE + name="Ralink RT2700/2800 IEEE802.11 a/b/g/n Wireless Network Device" +license usr/src/uts/common/io/rwn/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/rwn/THIRDPARTYLICENSE +license usr/src/uts/common/io/rwn/fw-rt2860/LICENSE \ + license=usr/src/uts/common/io/rwn/fw-rt2860/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-sdp.mf b/usr/src/pkg/manifests/driver-network-sdp.mf index 6afaf8da74..2a0bd22833 100644 --- a/usr/src/pkg/manifests/driver-network-sdp.mf +++ b/usr/src/pkg/manifests/driver-network-sdp.mf @@ -37,6 +37,7 @@ set name=info.classification \ value=org.opensolaris.category.2008:System/Hardware set name=variant.arch value=$(ARCH) dir path=etc group=sys +dir path=etc/sock2path.d group=sys dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -45,16 +46,14 @@ dir path=kernel/socketmod/$(ARCH64) group=sys driver name=sdp perms="* 0644 root sys" perms="sdp 0666 root sys" file path=etc/sdp.conf group=sys original_name=SUNWibsdp:etc/sdp.conf \ preserve=true +file path=etc/sock2path.d/driver%2Fnetwork%2Fsdp group=sys 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 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" \ - name="Sun InfiniBand layered Sockets Direct Protocol" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWibsdp desc="Sun InfiniBand layered Sockets Direct Protocol" \ + name="Sun InfiniBand layered Sockets Direct Protocol" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL diff --git a/usr/src/pkg/manifests/driver-network-sdpib.mf b/usr/src/pkg/manifests/driver-network-sdpib.mf index d8d1dc6001..ad7919cbbd 100644 --- a/usr/src/pkg/manifests/driver-network-sdpib.mf +++ b/usr/src/pkg/manifests/driver-network-sdpib.mf @@ -47,11 +47,8 @@ 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 -legacy pkg=SUNWibsdpib arch=$(ARCH) category=system \ - desc="Sun InfiniBand Sockets Direct Protocol" \ - hotline="Please contact your local service provider" \ - name="Sun InfiniBand Sockets Direct Protocol" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWibsdpib desc="Sun InfiniBand Sockets Direct Protocol" \ + name="Sun InfiniBand Sockets Direct Protocol" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-sfe.mf b/usr/src/pkg/manifests/driver-network-sfe.mf index 4a90c4909e..ffc3725901 100644 --- a/usr/src/pkg/manifests/driver-network-sfe.mf +++ b/usr/src/pkg/manifests/driver-network-sfe.mf @@ -45,10 +45,7 @@ driver name=sfe perms="* 0666 root root" \ alias=pci1039,900 file path=kernel/drv/$(ARCH64)/sfe group=sys $(i386_ONLY)file path=kernel/drv/sfe group=sys -legacy pkg=SUNWsfe arch=$(ARCH) category=system \ - desc="SiS900 series Fast Ethernet Network Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="SiS900 Ethernet Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license uts/common/io/sfe/THIRDPARTYLICENSE \ - license=uts/common/io/sfe/THIRDPARTYLICENSE +legacy pkg=SUNWsfe desc="SiS900 series Fast Ethernet Network Adapter Driver" \ + name="SiS900 Ethernet Driver" +license usr/src/uts/common/io/sfe/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/sfe/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-socal.mf b/usr/src/pkg/manifests/driver-network-socal.mf index 03ad7d59c1..99cf7291e6 100644 --- a/usr/src/pkg/manifests/driver-network-socal.mf +++ b/usr/src/pkg/manifests/driver-network-socal.mf @@ -41,10 +41,7 @@ dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=socal alias=SUNW,socal file path=kernel/drv/$(ARCH64)/socal group=sys -legacy pkg=SUNWluxl arch=$(ARCH) category=system \ - desc="Sun Enterprise Network Array socal Device Driver" \ - hotline="Please contact your local service provider" \ - name="Sun Enterprise Network Array socal Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWluxl desc="Sun Enterprise Network Array socal Device Driver" \ + name="Sun Enterprise Network Array socal Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-srpt.mf b/usr/src/pkg/manifests/driver-network-srpt.mf index a13de491ea..378584d798 100644 --- a/usr/src/pkg/manifests/driver-network-srpt.mf +++ b/usr/src/pkg/manifests/driver-network-srpt.mf @@ -67,16 +67,10 @@ 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 -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 -legacy pkg=SUNWsrptu arch=$(ARCH) category=system \ - desc="Sun SRP COMSTAR Port Provider utilities (Usr)" \ - hotline="Please contact your local service provider" \ - name="Sun SRP COMSTAR Port Provider utilities (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWsrptr desc="Sun SRP COMSTAR Port Provider (Root)" \ + name="Sun SRP COMSTAR Port Provider (Root)" +legacy pkg=SUNWsrptu desc="Sun SRP COMSTAR Port Provider utilities (Usr)" \ + name="Sun SRP COMSTAR Port Provider utilities (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/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 3087c4de53..29fdc2556f 100644 --- a/usr/src/pkg/manifests/driver-network-tavor.mf +++ b/usr/src/pkg/manifests/driver-network-tavor.mf @@ -48,10 +48,7 @@ driver name=tavor perms="* 0666 root sys" \ 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 -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." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWtavor desc="Tavor HCA driver" name="Sun Tavor HCA driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-network-uath.mf b/usr/src/pkg/manifests/driver-network-uath.mf index 7fe8aa77f0..9ddb89e1d6 100644 --- a/usr/src/pkg/manifests/driver-network-uath.mf +++ b/usr/src/pkg/manifests/driver-network-uath.mf @@ -51,12 +51,10 @@ 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 file path=kernel/misc/uathfw group=sys mode=0755 -legacy pkg=SUNWuath arch=$(ARCH) category=system \ +legacy pkg=SUNWuath \ desc="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \ - hotline="Please contact your local service provider" \ - name="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license uts/common/io/uath/THIRDPARTYLICENSE \ - license=uts/common/io/uath/THIRDPARTYLICENSE -license uts/common/io/uath/uath_fw/LICENSE \ - license=uts/common/io/uath/uath_fw/LICENSE + name="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" +license usr/src/uts/common/io/uath/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/uath/THIRDPARTYLICENSE +license usr/src/uts/common/io/uath/uath_fw/LICENSE \ + license=usr/src/uts/common/io/uath/uath_fw/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-ural.mf b/usr/src/pkg/manifests/driver-network-ural.mf index 72627bc1a5..e06e8dd938 100644 --- a/usr/src/pkg/manifests/driver-network-ural.mf +++ b/usr/src/pkg/manifests/driver-network-ural.mf @@ -45,11 +45,8 @@ driver name=ural clone_perms="ural 0666 root sys" perms="* 0666 root sys" \ alias=usb411,67 file path=kernel/drv/$(ARCH64)/ural group=sys file path=kernel/drv/ural group=sys -legacy pkg=SUNWural arch=$(ARCH) category=system \ - desc="Ralink RT2500USB 802.11b/g Wireless Driver" \ - hotline="Please contact your local service provider" \ - name="Ralink RT2500USB 802.11b/g Wireless Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWural desc="Ralink RT2500USB 802.11b/g Wireless Driver" \ + name="Ralink RT2500USB 802.11b/g Wireless Driver" license cr_Sun license=cr_Sun -license uts/common/io/ural/THIRDPARTYLICENSE \ - license=uts/common/io/ural/THIRDPARTYLICENSE +license usr/src/uts/common/io/ural/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ural/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-urtw.mf b/usr/src/pkg/manifests/driver-network-urtw.mf index 87a8d89250..a1f849831e 100644 --- a/usr/src/pkg/manifests/driver-network-urtw.mf +++ b/usr/src/pkg/manifests/driver-network-urtw.mf @@ -54,11 +54,8 @@ driver name=urtw clone_perms="urtw 0666 root sys" perms="* 0666 root sys" \ alias=usbdf6,28 file path=kernel/drv/$(ARCH64)/urtw group=sys file path=kernel/drv/urtw group=sys -legacy pkg=SUNWurtw arch=$(ARCH) category=system \ - desc="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \ - hotline="Please contact your local service provider" \ - name="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWurtw desc="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \ + name="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" license cr_Sun license=cr_Sun -license uts/common/io/urtw/THIRDPARTYLICENSE \ - license=uts/common/io/urtw/THIRDPARTYLICENSE +license usr/src/uts/common/io/urtw/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/urtw/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-vr.mf b/usr/src/pkg/manifests/driver-network-vr.mf index cec4be76e3..ef528fabef 100644 --- a/usr/src/pkg/manifests/driver-network-vr.mf +++ b/usr/src/pkg/manifests/driver-network-vr.mf @@ -45,10 +45,7 @@ driver name=vr perms="* 0666 root sys" \ alias=pci1106,3106 file path=kernel/drv/$(ARCH64)/vr group=sys $(i386_ONLY)file path=kernel/drv/vr group=sys -legacy pkg=SUNWvr arch=$(ARCH) category=system \ - desc="VIA Rhine Fast Ethernet driver" \ - hotline="Please contact your local service provider" \ - name="VIA Rhine Fast Ethernet driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWvr desc="VIA Rhine Fast Ethernet driver" \ + name="VIA Rhine Fast Ethernet driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-wpi.mf b/usr/src/pkg/manifests/driver-network-wpi.mf index bf84657b33..c754a0d389 100644 --- a/usr/src/pkg/manifests/driver-network-wpi.mf +++ b/usr/src/pkg/manifests/driver-network-wpi.mf @@ -55,13 +55,10 @@ driver name=wpi clone_perms="wpi 0666 root sys" perms="* 0666 root sys" \ alias=pciex8086,4227.8086.1014 file path=kernel/drv/$(ARCH64)/wpi group=sys 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 +legacy pkg=SUNWwpi desc="Intel(R) PRO/Wireless 3945ABG driver" \ + name="Intel(R) PRO/Wireless 3945ABG driver" license cr_Sun license=cr_Sun -license uts/common/io/wpi/THIRDPARTYLICENSE \ - license=uts/common/io/wpi/THIRDPARTYLICENSE -license uts/common/io/wpi/fw-wpi/LICENSE \ - license=uts/common/io/wpi/fw-wpi/LICENSE +license usr/src/uts/common/io/wpi/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/wpi/THIRDPARTYLICENSE +license usr/src/uts/common/io/wpi/fw-wpi/LICENSE \ + license=usr/src/uts/common/io/wpi/fw-wpi/LICENSE diff --git a/usr/src/pkg/manifests/driver-network-xge.mf b/usr/src/pkg/manifests/driver-network-xge.mf index 133d84e17f..b14fc7cb95 100644 --- a/usr/src/pkg/manifests/driver-network-xge.mf +++ b/usr/src/pkg/manifests/driver-network-xge.mf @@ -45,10 +45,8 @@ driver name=xge clone_perms="xge 0666 root sys" perms="* 0666 root sys" \ alias=pci17d5,5832 file path=kernel/drv/$(ARCH64)/xge group=sys $(i386_ONLY)file path=kernel/drv/xge group=sys -legacy pkg=SUNWxge arch=$(ARCH) category=system \ +legacy pkg=SUNWxge \ desc="Neterion Xframe (I/II) 10 Gigabit Ethernet Adapter Driver" \ - hotline="Please contact your local service provider" \ - name="Xframe 10GE NIC Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Xframe 10GE NIC Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-network-yge.mf b/usr/src/pkg/manifests/driver-network-yge.mf index 8e397a7db4..6b036f742c 100644 --- a/usr/src/pkg/manifests/driver-network-yge.mf +++ b/usr/src/pkg/manifests/driver-network-yge.mf @@ -49,10 +49,8 @@ driver name=yge perms="* 0666 root sys" \ alias=pciex11ab,436a file path=kernel/drv/$(ARCH64)/yge group=sys $(i386_ONLY)file path=kernel/drv/yge group=sys -legacy pkg=SUNWyge arch=$(ARCH) category=system \ - desc="Marvell Yukon 2 Gigabit Ethernet Controller Driver" \ - hotline="Please contact your local service provider" \ - name="Marvell Yukon 2 Gigabit Ethernet Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWyge desc="Marvell Yukon 2 Gigabit Ethernet Controller Driver" \ + name="Marvell Yukon 2 Gigabit Ethernet Driver" license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL +license usr/src/uts/common/io/yge/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/yge/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-network-zyd.mf b/usr/src/pkg/manifests/driver-network-zyd.mf index 3a07f714f5..572edce976 100644 --- a/usr/src/pkg/manifests/driver-network-zyd.mf +++ b/usr/src/pkg/manifests/driver-network-zyd.mf @@ -45,11 +45,8 @@ driver name=zyd clone_perms="zyd 0666 root sys" perms="* 0666 root sys" \ alias=usbace,1215 file path=kernel/drv/$(ARCH64)/zyd group=sys file path=kernel/drv/zyd group=sys -legacy pkg=SUNWzyd arch=$(ARCH) category=system \ - desc="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \ - hotline="Please contact your local service provider" \ - name="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWzyd desc="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \ + name="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" license cr_Sun license=cr_Sun -license uts/common/io/zyd/THIRDPARTYLICENSE \ - license=uts/common/io/zyd/THIRDPARTYLICENSE +license usr/src/uts/common/io/zyd/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/zyd/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-pcmcia.mf b/usr/src/pkg/manifests/driver-pcmcia.mf index c68faa009a..74e6003374 100644 --- a/usr/src/pkg/manifests/driver-pcmcia.mf +++ b/usr/src/pkg/manifests/driver-pcmcia.mf @@ -48,10 +48,8 @@ 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 $(i386_ONLY)file path=kernel/drv/pcs group=sys -legacy pkg=SUNWpcmci arch=$(ARCH) category=system \ +legacy pkg=SUNWpcmci \ desc="kernel modules and start-up files for PCMCIA card services" \ - hotline="Please contact your local service provider" \ - name="PCMCIA Card Services, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="PCMCIA Card Services, (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-serial-pcser.mf b/usr/src/pkg/manifests/driver-serial-pcser.mf index c0b262fa57..c326c67f74 100644 --- a/usr/src/pkg/manifests/driver-serial-pcser.mf +++ b/usr/src/pkg/manifests/driver-serial-pcser.mf @@ -45,11 +45,8 @@ driver name=pcser perms="* 0666 uucp uucp" \ alias=pccard102,5 file path=kernel/drv/$(ARCH64)/pcser group=sys $(i386_ONLY)file path=kernel/drv/pcser group=sys -legacy pkg=SUNWpcser arch=$(ARCH) category=system \ - desc="PCMCIA serial card driver" \ - hotline="Please contact your local service provider" \ - name="PCMCIA serial card driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpcser desc="PCMCIA serial card driver" \ + name="PCMCIA serial card driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-serial-usbftdi.mf b/usr/src/pkg/manifests/driver-serial-usbftdi.mf index 26727a24b3..9dcd8ce220 100644 --- a/usr/src/pkg/manifests/driver-serial-usbftdi.mf +++ b/usr/src/pkg/manifests/driver-serial-usbftdi.mf @@ -66,10 +66,7 @@ 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 -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 +legacy pkg=SUNWuftdi desc="FTDI FT232R USB serial driver" \ + name="FT232R USB UART" 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 63aa90938b..cf056676ec 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsacm.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsacm.mf @@ -44,10 +44,7 @@ driver name=usbsacm perms="* 0666 root sys" \ alias=usbif,class2.2 file path=kernel/drv/$(ARCH64)/usbsacm group=sys $(i386_ONLY)file path=kernel/drv/usbsacm group=sys -legacy pkg=SUNWuacm arch=$(ARCH) category=system \ - desc="CDC ACM USB-to-serial driver" \ - hotline="Please contact your local service provider" \ - name="CDC ACM USB-to-serial driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWuacm desc="CDC ACM USB-to-serial driver" \ + name="CDC ACM USB-to-serial driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-serial-usbser.mf b/usr/src/pkg/manifests/driver-serial-usbser.mf index 6efe582fb9..fc92355e92 100644 --- a/usr/src/pkg/manifests/driver-serial-usbser.mf +++ b/usr/src/pkg/manifests/driver-serial-usbser.mf @@ -40,10 +40,7 @@ dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys 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" \ - name="USB generic serial module" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWusbs desc="USB generic serial module" \ + name="USB generic serial module" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf index 2b4bf354a6..7b18dd3223 100644 --- a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf +++ b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf @@ -73,11 +73,8 @@ 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 -legacy pkg=SUNWuedg arch=$(ARCH) category=system \ - desc="USB Digi Edgeport serial driver" \ - hotline="Please contact your local service provider" \ - name="USB Digi Edgeport serial driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWuedg desc="USB Digi Edgeport serial driver" \ + name="USB Digi Edgeport serial driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble 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 7ec3e9e059..99de965d53 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf @@ -43,10 +43,7 @@ file path=kernel/misc/$(ARCH64)/usbs49_fw group=sys mode=0755 \ 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 -legacy pkg=SUNWukspfw arch=$(ARCH) category=system \ - desc="USA49WLC firmware for USB Keyspan serial driver" \ - hotline="Please contact your local service provider" \ - name="USA49WLC firmware for USB Keyspan serial driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWukspfw desc="USA49WLC firmware for USB Keyspan serial driver" \ + name="USA49WLC firmware for USB Keyspan serial driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp.mf b/usr/src/pkg/manifests/driver-serial-usbsksp.mf index d8c471f53f..7a7f9f490a 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsksp.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsksp.mf @@ -44,10 +44,7 @@ driver name=usbsksp perms="* 0666 root sys" \ alias=usb6cd,131 file path=kernel/drv/$(ARCH64)/usbsksp group=sys $(i386_ONLY)file path=kernel/drv/usbsksp group=sys -legacy pkg=SUNWuksp arch=$(ARCH) category=system \ - desc="USB Keyspan serial driver" \ - hotline="Please contact your local service provider" \ - name="USB Keyspan serial driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWuksp desc="USB Keyspan serial driver" \ + name="USB Keyspan serial driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-serial-usbsprl.mf b/usr/src/pkg/manifests/driver-serial-usbsprl.mf index e450f20dba..ea4a552290 100644 --- a/usr/src/pkg/manifests/driver-serial-usbsprl.mf +++ b/usr/src/pkg/manifests/driver-serial-usbsprl.mf @@ -46,10 +46,7 @@ driver name=usbsprl perms="* 0666 root sys" \ alias=usb67b,aaa2 file path=kernel/drv/$(ARCH64)/usbsprl group=sys $(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 +legacy pkg=SUNWuprl desc="Prolific PL2303 USB-to-serial driver" \ + name="Prolific PL2303 USB-to-serial driver" 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 250f051899..ec0734b366 100644 --- a/usr/src/pkg/manifests/driver-sparc-platform.mf +++ b/usr/src/pkg/manifests/driver-sparc-platform.mf @@ -67,9 +67,7 @@ file path=kernel/drv/$(ARCH64)/mpt group=sys file path=kernel/drv/$(ARCH64)/se group=sys 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 +legacy pkg=SUNWpd desc="Drivers for the PCI bus" name="PCI Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL diff --git a/usr/src/pkg/manifests/driver-storage-aac.mf b/usr/src/pkg/manifests/driver-storage-aac.mf index 371bfb7b3f..2e2f16a801 100644 --- a/usr/src/pkg/manifests/driver-storage-aac.mf +++ b/usr/src/pkg/manifests/driver-storage-aac.mf @@ -49,11 +49,8 @@ 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 -legacy pkg=SUNWaac arch=$(ARCH) category=system \ - desc="Adaptec AdvanceRaid Controller SCSI HBA Driver" \ - hotline="Please contact your local service provider" \ - name="Adaptec AdvanceRaid Controller SCSI HBA Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWaac desc="Adaptec AdvanceRaid Controller SCSI HBA Driver" \ + name="Adaptec AdvanceRaid Controller SCSI HBA Driver" license cr_Sun license=cr_Sun -license uts/common/io/aac/THIRDPARTYLICENSE \ - license=uts/common/io/aac/THIRDPARTYLICENSE +license usr/src/uts/common/io/aac/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/aac/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-storage-adpu320.mf b/usr/src/pkg/manifests/driver-storage-adpu320.mf index 6fbbea081d..aeddd7d411 100644 --- a/usr/src/pkg/manifests/driver-storage-adpu320.mf +++ b/usr/src/pkg/manifests/driver-storage-adpu320.mf @@ -54,11 +54,8 @@ driver name=adpu320 class=scsi perms="adpu320ctl 0666 root root" \ file path=kernel/drv/$(ARCH64)/adpu320 group=sys file path=kernel/drv/adpu320 group=sys 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" \ - name="Adaptec Ultra320 Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWadpu320 desc="Adaptec 7902 SCSI Driver" \ + name="Adaptec Ultra320 Driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-storage-ahci.mf b/usr/src/pkg/manifests/driver-storage-ahci.mf index e02a01065e..c88905bd1d 100644 --- a/usr/src/pkg/manifests/driver-storage-ahci.mf +++ b/usr/src/pkg/manifests/driver-storage-ahci.mf @@ -43,10 +43,8 @@ driver name=ahci alias=pciclass,010601 class=scsi-self-identifying \ perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/ahci group=sys file path=kernel/drv/ahci group=sys -legacy pkg=SUNWahci arch=$(ARCH) category=system \ +legacy pkg=SUNWahci \ desc="Advanced Host Controller Interface (AHCI) SATA HBA Driver" \ - hotline="Please contact your local service provider" \ - name="Advanced Host Controller Interface (AHCI) SATA HBA Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Advanced Host Controller Interface (AHCI) SATA HBA Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-amr.mf b/usr/src/pkg/manifests/driver-storage-amr.mf index 54bb8f8799..69ad8a1883 100644 --- a/usr/src/pkg/manifests/driver-storage-amr.mf +++ b/usr/src/pkg/manifests/driver-storage-amr.mf @@ -47,11 +47,8 @@ driver name=amr class=scsi \ file path=kernel/drv/$(ARCH64)/amr group=sys file path=kernel/drv/amr group=sys 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" \ - name="LSI MegaRAID SCSI HBA Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWamr desc="LSI MegaRAID SCSI HBA Driver" \ + name="LSI MegaRAID SCSI HBA Driver" license cr_Sun license=cr_Sun -license uts/intel/io/amr/THIRDPARTYLICENSE \ - license=uts/intel/io/amr/THIRDPARTYLICENSE +license usr/src/uts/intel/io/amr/THIRDPARTYLICENSE \ + license=usr/src/uts/intel/io/amr/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-storage-arcmsr.mf b/usr/src/pkg/manifests/driver-storage-arcmsr.mf index 5e7a11eac8..ddc57a1208 100644 --- a/usr/src/pkg/manifests/driver-storage-arcmsr.mf +++ b/usr/src/pkg/manifests/driver-storage-arcmsr.mf @@ -58,9 +58,7 @@ driver name=arcmsr class=scsi perms="* 0600 root sys" \ file path=kernel/drv/$(ARCH64)/arcmsr group=sys file path=kernel/drv/arcmsr group=sys 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." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWarcmsr desc="SAS/SATA RAID driver" \ + name="Areca SAS/SATA RAID driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-ata.mf b/usr/src/pkg/manifests/driver-storage-ata.mf index 7ada8fbc3f..cdb6c5dae3 100644 --- a/usr/src/pkg/manifests/driver-storage-ata.mf +++ b/usr/src/pkg/manifests/driver-storage-ata.mf @@ -59,10 +59,7 @@ 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 -legacy pkg=SUNWpsdir arch=$(ARCH) category=system \ - desc="Platform Support, ISA Bus Device Drivers, (Root)" \ - hotline="Please contact your local service provider" \ - name="Platform Support, ISA Bus Device Drivers, (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWpsdir desc="Platform Support, ISA Bus Device Drivers, (Root)" \ + name="Platform Support, ISA Bus Device Drivers, (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf index 2d7c9e4255..d70ba84d6e 100644 --- a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf +++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf @@ -42,11 +42,8 @@ driver name=bcm_sata alias=pci1166,24a class=scsi-self-identifying \ perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/bcm_sata group=sys file path=kernel/drv/bcm_sata group=sys -legacy pkg=SUNWbcmsata arch=$(ARCH) category=system \ - desc="BroadCom ht1000 sata driver" \ - hotline="Please contact your local service provider" \ - name="BroadCom ht1000 sata driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWbcmsata desc="BroadCom ht1000 sata driver" \ + name="BroadCom ht1000 sata driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-storage-cpqary3.mf b/usr/src/pkg/manifests/driver-storage-cpqary3.mf index c8d267cb88..2f489e5d72 100644 --- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf +++ b/usr/src/pkg/manifests/driver-storage-cpqary3.mf @@ -67,11 +67,7 @@ driver name=cpqary3 class=scsi \ file path=kernel/drv/$(ARCH64)/cpqary3 group=sys file path=kernel/drv/cpqary3 group=sys 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" \ - name="HP Smart Array HBA Driver 2.2.0.1" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=CPQary3 desc="HP Smart Array HBA Driver 2.2.0.1" \ + name="HP Smart Array HBA Driver 2.2.0.1" license cr_Sun license=cr_Sun -license lic_HP license=lic_HP license lic_OSBL license=lic_OSBL 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 f15ac5c9be..6b1e9d3bdd 100644 --- a/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf +++ b/usr/src/pkg/manifests/driver-storage-fas-header-fas.mf @@ -38,10 +38,7 @@ 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" \ - hotline="Please contact your local service provider" \ - name="SunSwift Adapter Headers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWhmdu desc="SunSwift Adapter Headers" \ + name="SunSwift Adapter Headers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-glm.mf b/usr/src/pkg/manifests/driver-storage-glm.mf index 2cbc3ebd22..3d6ff80d26 100644 --- a/usr/src/pkg/manifests/driver-storage-glm.mf +++ b/usr/src/pkg/manifests/driver-storage-glm.mf @@ -42,9 +42,7 @@ 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 -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 +legacy pkg=SUNWpd desc="Drivers for the PCI bus" name="PCI Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL diff --git a/usr/src/pkg/manifests/driver-storage-ifp.mf b/usr/src/pkg/manifests/driver-storage-ifp.mf index 2a33404d08..17f845a9f5 100644 --- a/usr/src/pkg/manifests/driver-storage-ifp.mf +++ b/usr/src/pkg/manifests/driver-storage-ifp.mf @@ -43,10 +43,8 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=ifp alias=pci1077,2100 perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/ifp group=sys file path=kernel/drv/ifp.conf group=sys -legacy pkg=SUNWifp arch=$(ARCH) category=system \ +legacy pkg=SUNWifp \ desc="Sun FC-AL Device Driver For QLogic Fibre Channel Family" \ - hotline="Please contact your local service provider" \ - name="Sun Fibre Channel Arbitrated Loop Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun Fibre Channel Arbitrated Loop Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-lsimega.mf b/usr/src/pkg/manifests/driver-storage-lsimega.mf index d04f980e11..fe3adcb862 100644 --- a/usr/src/pkg/manifests/driver-storage-lsimega.mf +++ b/usr/src/pkg/manifests/driver-storage-lsimega.mf @@ -49,11 +49,8 @@ driver name=lsimega class=scsi \ file path=kernel/drv/$(ARCH64)/lsimega group=sys file path=kernel/drv/lsimega group=sys 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" \ - name="LSI Hardware RAID HBA Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWlsimega desc="LSI Hardware RAID HBA Driver" \ + name="LSI Hardware RAID HBA Driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf index a6ee4d81dc..16b46a6614 100644 --- a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf +++ b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf @@ -46,11 +46,8 @@ driver name=marvell88sx class=scsi-self-identifying perms="* 0644 root sys" \ alias=pci11ab,6081.9 file path=kernel/drv/$(ARCH64)/marvell88sx group=sys file path=kernel/drv/marvell88sx group=sys -legacy pkg=SUNWmv88sx arch=$(ARCH) category=system \ - desc="Marvell 88sx sata driver" \ - hotline="Please contact your local service provider" \ - name="Marvell 88sx sata driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWmv88sx desc="Marvell 88sx sata driver" \ + name="Marvell 88sx sata driver" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/driver-storage-mega_sas.mf b/usr/src/pkg/manifests/driver-storage-mega_sas.mf index 17ab12c1c5..b2434a1108 100644 --- a/usr/src/pkg/manifests/driver-storage-mega_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mega_sas.mf @@ -145,12 +145,7 @@ driver name=mega_sas class=scsi \ 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 -legacy pkg=SUNWmegasas arch=$(ARCH) category=system \ - desc="LSI MegaSAS RAID Controller HBA Driver" \ - hotline="Please contact your local service provider" \ - name="LSI MegaSAS RAID Controller HBA 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/io/mega_sas/THIRDPARTYLICENSE \ - license=uts/common/io/mega_sas/THIRDPARTYLICENSE +legacy pkg=SUNWmegasas desc="LSI MegaSAS RAID Controller HBA Driver" \ + name="LSI MegaSAS RAID Controller HBA Driver" +license usr/src/uts/common/io/mega_sas/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/mega_sas/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf index 96edba508d..5663d8e3b5 100644 --- a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf @@ -51,10 +51,7 @@ 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 -legacy pkg=SUNWmptsas arch=$(ARCH) category=system \ - desc="LSI MPT SAS 2.0 Controller HBA Driver" \ - hotline="Please contact your local service provider" \ - name="LSI MPT SAS 2.0 Controller HBA Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWmptsas desc="LSI MPT SAS 2.0 Controller HBA Driver" \ + name="LSI MPT SAS 2.0 Controller HBA Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.mf b/usr/src/pkg/manifests/driver-storage-mr_sas.mf index fa4d0dde93..3e638b8b76 100644 --- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mr_sas.mf @@ -49,10 +49,8 @@ $(i386_ONLY)driver name=mr_sas class=scsi-self-identifying \ 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 -legacy pkg=SUNWmrsas arch=$(ARCH) category=system \ - desc="LSI MegaRAID SAS2.0 Controller HBA Driver" \ - hotline="Please contact your local service provider" \ - name="LSI MegaRAID SAS2.0 HBA Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWmrsas desc="LSI MegaRAID SAS2.0 Controller HBA Driver" \ + name="LSI MegaRAID SAS2.0 HBA Driver" license cr_Sun license=cr_Sun -license lic_CDDL license=lic_CDDL +license usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/mr_sas/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-storage-nv_sata.mf b/usr/src/pkg/manifests/driver-storage-nv_sata.mf index 1c7dc4159e..4bdf529cc8 100644 --- a/usr/src/pkg/manifests/driver-storage-nv_sata.mf +++ b/usr/src/pkg/manifests/driver-storage-nv_sata.mf @@ -47,10 +47,7 @@ driver name=nv_sata class=scsi-self-identifying perms="* 0644 root sys" \ 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 -legacy pkg=SUNWnvsata arch=$(ARCH) category=system \ - desc="Nvidia ck804 pro / mcp55 pro combo SATA driver" \ - hotline="Please contact your local service provider" \ - name="Nvidia ck804 pro / mcp55 pro combo SATA driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWnvsata desc="Nvidia ck804 pro / mcp55 pro combo SATA driver" \ + name="Nvidia ck804 pro / mcp55 pro combo SATA driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-pcata.mf b/usr/src/pkg/manifests/driver-storage-pcata.mf index 3dd2e8f27c..5a30089dbb 100644 --- a/usr/src/pkg/manifests/driver-storage-pcata.mf +++ b/usr/src/pkg/manifests/driver-storage-pcata.mf @@ -41,10 +41,7 @@ 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" \ - hotline="Please contact your local service provider" \ - name="PCMCIA ATA card driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpsdpr desc="PCMCIA ATA card driver" \ + name="PCMCIA ATA card driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-pmcs.mf b/usr/src/pkg/manifests/driver-storage-pmcs.mf index c72333c117..a537835c91 100644 --- a/usr/src/pkg/manifests/driver-storage-pmcs.mf +++ b/usr/src/pkg/manifests/driver-storage-pmcs.mf @@ -60,17 +60,11 @@ 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 \ - desc="PMC-Sierra SAS-2 HBA Driver (root)" \ - hotline="Please contact your local service provider" \ - name="PMC-Sierra SAS-2 HBA driver (root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWpmcsu arch=$(ARCH) category=system \ - desc="PMC-Sierra SAS-2 HBA driver (usr)" \ - hotline="Please contact your local service provider" \ - name="PMC-Sierra SAS-2 HBA driver (usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpmcsr desc="PMC-Sierra SAS-2 HBA Driver (root)" \ + name="PMC-Sierra SAS-2 HBA driver (root)" +legacy pkg=SUNWpmcsu desc="PMC-Sierra SAS-2 HBA driver (usr)" \ + name="PMC-Sierra SAS-2 HBA driver (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/scsi/adapters/pmcs/LICENSE \ - license=uts/common/io/scsi/adapters/pmcs/LICENSE +license usr/src/uts/common/io/scsi/adapters/pmcs/LICENSE \ + license=usr/src/uts/common/io/scsi/adapters/pmcs/LICENSE diff --git a/usr/src/pkg/manifests/driver-storage-qus.mf b/usr/src/pkg/manifests/driver-storage-qus.mf index 2c182be40f..4d9a3f34be 100644 --- a/usr/src/pkg/manifests/driver-storage-qus.mf +++ b/usr/src/pkg/manifests/driver-storage-qus.mf @@ -42,8 +42,6 @@ dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys driver name=qus alias=pci1077,1016 class=scsi perms="* 0600 root sys" file path=kernel/drv/$(ARCH64)/qus group=sys -legacy pkg=SUNWqus arch=$(ARCH) category=system \ +legacy pkg=SUNWqus \ desc="Software to support Qlogic Ultra3 scsi host bus adapters" \ - hotline="Please contact your local service provider" \ - name="QLogic Ultra3 Scsi, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="QLogic Ultra3 Scsi, (Root)" diff --git a/usr/src/pkg/manifests/driver-storage-sbp2.mf b/usr/src/pkg/manifests/driver-storage-sbp2.mf index bf42bfa51d..99f5a5b375 100644 --- a/usr/src/pkg/manifests/driver-storage-sbp2.mf +++ b/usr/src/pkg/manifests/driver-storage-sbp2.mf @@ -40,10 +40,7 @@ dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys 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" \ - name="Serial Bus Protocol 2 module" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWsbp2 desc="Serial Bus Protocol 2 module" \ + name="Serial Bus Protocol 2 module" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-scsa1394.mf b/usr/src/pkg/manifests/driver-storage-scsa1394.mf index 43fac482ce..fed59448f9 100644 --- a/usr/src/pkg/manifests/driver-storage-scsa1394.mf +++ b/usr/src/pkg/manifests/driver-storage-scsa1394.mf @@ -40,10 +40,7 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=scsa1394 alias=firewire00609e,010483 perms="* 0666 root sys" file path=kernel/drv/$(ARCH64)/scsa1394 group=sys $(i386_ONLY)file path=kernel/drv/scsa1394 group=sys -legacy pkg=SUNWscsa1394 arch=$(ARCH) category=system \ - desc="IEEE 1394 mass storage driver" \ - hotline="Please contact your local service provider" \ - name="IEEE 1394 mass storage driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWscsa1394 desc="IEEE 1394 mass storage driver" \ + name="IEEE 1394 mass storage driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-sdcard.mf b/usr/src/pkg/manifests/driver-storage-sdcard.mf index 2702835df3..987035a40f 100644 --- a/usr/src/pkg/manifests/driver-storage-sdcard.mf +++ b/usr/src/pkg/manifests/driver-storage-sdcard.mf @@ -50,10 +50,6 @@ $(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 $(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" \ - name="SD/MMC Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +$(i386_ONLY)legacy pkg=SUNWsdcard desc="SD/MMC Drivers" name="SD/MMC Drivers" $(i386_ONLY)license cr_Sun license=cr_Sun $(i386_ONLY)license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-ses.mf b/usr/src/pkg/manifests/driver-storage-ses.mf index 829b396233..7a0c36a19b 100644 --- a/usr/src/pkg/manifests/driver-storage-ses.mf +++ b/usr/src/pkg/manifests/driver-storage-ses.mf @@ -43,10 +43,7 @@ driver name=ses perms="* 0666 bin bin" \ 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 -legacy pkg=SUNWses arch=$(ARCH) category=system \ - desc="SCSI Enclosure Services (ses) Device Driver" \ - hotline="Please contact your local service provider" \ - name="SCSI Enclosure Services Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWses desc="SCSI Enclosure Services (ses) Device Driver" \ + name="SCSI Enclosure Services Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-sf.mf b/usr/src/pkg/manifests/driver-storage-sf.mf index 35431b7728..bf291b7d3c 100644 --- a/usr/src/pkg/manifests/driver-storage-sf.mf +++ b/usr/src/pkg/manifests/driver-storage-sf.mf @@ -43,10 +43,8 @@ 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 -legacy pkg=SUNWluxd.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWluxd.u arch=$(ARCH).sun4u \ desc="Sun Enterprise Network Array sf Device Driver" \ - hotline="Please contact your local service provider" \ - name="Sun Enterprise Network Array sf Device Driver" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun Enterprise Network Array sf Device Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-si3124.mf b/usr/src/pkg/manifests/driver-storage-si3124.mf index 46c9df59ac..3e94883f8f 100644 --- a/usr/src/pkg/manifests/driver-storage-si3124.mf +++ b/usr/src/pkg/manifests/driver-storage-si3124.mf @@ -42,10 +42,7 @@ driver name=si3124 class=scsi-self-identifying perms="* 0644 root sys" \ alias=pci1095,3132 file path=kernel/drv/$(ARCH64)/si3124 group=sys file path=kernel/drv/si3124 group=sys -legacy pkg=SUNWsi3124 arch=$(ARCH) category=system \ - desc="SiliconImage 3124 sata driver" \ - hotline="Please contact your local service provider" \ - name="SiliconImage 3124 sata driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWsi3124 desc="SiliconImage 3124 sata driver" \ + name="SiliconImage 3124 sata driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-smp.mf b/usr/src/pkg/manifests/driver-storage-smp.mf index a34a82b446..e73f8d2d04 100644 --- a/usr/src/pkg/manifests/driver-storage-smp.mf +++ b/usr/src/pkg/manifests/driver-storage-smp.mf @@ -44,10 +44,8 @@ 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 -legacy pkg=SUNWsmpd arch=$(ARCH) category=system \ +legacy pkg=SUNWsmpd \ desc="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" \ - hotline="Please contact your local service provider" \ - name="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-ssd.mf b/usr/src/pkg/manifests/driver-storage-ssd.mf index 94ab45f982..581e2c0b35 100644 --- a/usr/src/pkg/manifests/driver-storage-ssd.mf +++ b/usr/src/pkg/manifests/driver-storage-ssd.mf @@ -45,10 +45,7 @@ driver name=ssd perms="* 0640 root sys" \ 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 -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 +legacy pkg=SUNWssad desc="ssd kernel device driver" \ + name="SPARCstorage Array Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-sv.mf b/usr/src/pkg/manifests/driver-storage-sv.mf index 6c8e1033ec..daebdd2ae4 100644 --- a/usr/src/pkg/manifests/driver-storage-sv.mf +++ b/usr/src/pkg/manifests/driver-storage-sv.mf @@ -80,16 +80,10 @@ $(i386_ONLY)file path=usr/lib/mdb/kvm/sv.so group=sys mode=0555 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 -legacy pkg=SUNWspsvr arch=$(ARCH) category=system \ - desc="Raw/Block Device Interface to Storage Volumes (SV)" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Volume Driver (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWspsvu arch=$(ARCH) category=system \ - desc="Raw/Block Device Interface to Storage Volumes (SV)" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Volume Driver (usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWspsvr desc="Raw/Block Device Interface to Storage Volumes (SV)" \ + name="Sun StorageTek Availability Suite Volume Driver (root)" +legacy pkg=SUNWspsvu desc="Raw/Block Device Interface to Storage Volumes (SV)" \ + name="Sun StorageTek Availability Suite Volume Driver (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/cluster/lib/dscfg/start/15sv target=../../../sbin/sv diff --git a/usr/src/pkg/manifests/driver-usb-ugen.mf b/usr/src/pkg/manifests/driver-usb-ugen.mf index b269f30287..53c4dfe7c5 100644 --- a/usr/src/pkg/manifests/driver-usb-ugen.mf +++ b/usr/src/pkg/manifests/driver-usb-ugen.mf @@ -40,10 +40,6 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=ugen perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/ugen group=sys $(i386_ONLY)file path=kernel/drv/ugen group=sys -legacy pkg=SUNWugen arch=$(ARCH) category=system \ - desc="UGEN (USB Generic Driver)" \ - hotline="Please contact your local service provider" \ - name="USB Generic Driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWugen desc="UGEN (USB Generic Driver)" name="USB Generic Driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.mf index 685b1c2f35..184cd481aa 100644 --- a/usr/src/pkg/manifests/driver-usb.mf +++ b/usr/src/pkg/manifests/driver-usb.mf @@ -126,11 +126,10 @@ $(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" \ - name="USB Device Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWusb desc="USBA (USB framework) and USB Device Drivers" \ + name="USB Device Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license license_in_headers license=license_in_headers +license usr/src/uts/common/io/usb/clients/hwa1480_fw/i1480/LICENSE \ + license=usr/src/uts/common/io/usb/clients/hwa1480_fw/i1480/LICENSE diff --git a/usr/src/pkg/manifests/driver-x11-winlock.mf b/usr/src/pkg/manifests/driver-x11-winlock.mf index e052c82ec6..8a2a9dd65c 100644 --- a/usr/src/pkg/manifests/driver-x11-winlock.mf +++ b/usr/src/pkg/manifests/driver-x11-winlock.mf @@ -36,10 +36,7 @@ driver name=winlock perms="* 0666 root sys" file path=usr/kernel/drv/$(ARCH64)/winlock group=sys $(i386_ONLY)file path=usr/kernel/drv/winlock group=sys file path=usr/kernel/drv/winlock.conf group=sys -legacy pkg=SUNWxwdv arch=$(ARCH) category=system \ - desc="kernel device drivers for X Windows System" \ - hotline="Please contact your local service provider" \ - name="X Windows System Window Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWxwdv desc="kernel device drivers for X Windows System" \ + name="X Windows System Window Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-x11-xsvc.mf b/usr/src/pkg/manifests/driver-x11-xsvc.mf index e4ede6c3dd..3b8617d664 100644 --- a/usr/src/pkg/manifests/driver-x11-xsvc.mf +++ b/usr/src/pkg/manifests/driver-x11-xsvc.mf @@ -50,10 +50,7 @@ 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 -legacy pkg=SUNWxsvc arch=$(ARCH) category=system \ - desc="Sun Xserver pseudo driver" \ - hotline="Please contact your local service provider" \ - name="Sun Xserver pseudo driver" vendor="Sun Microsystems, Inc." \ - version=11.11.0,REV=2009.11.11 +legacy pkg=SUNWxsvc desc="Sun Xserver pseudo driver" \ + name="Sun Xserver pseudo driver" version=11.11.0,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-xvm-pv.mf b/usr/src/pkg/manifests/driver-xvm-pv.mf index f1cc313231..7992aa5bdc 100644 --- a/usr/src/pkg/manifests/driver-xvm-pv.mf +++ b/usr/src/pkg/manifests/driver-xvm-pv.mf @@ -68,10 +68,7 @@ file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_sd group=sys \ 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" \ - name="xVM Paravirtualized Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWxvmpv desc="xVM Paravirtualized Drivers" \ + name="xVM Paravirtualized Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.mf new file mode 100644 index 0000000000..b514748b28 --- /dev/null +++ b/usr/src/pkg/manifests/install-beadm.mf @@ -0,0 +1,55 @@ +# +# 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. +# + +set name=pkg.fmri value=pkg:/install/beadm@$(PKGVERS) +set name=pkg.description value="Boot Environment Management Tool" +set name=pkg.summary value="beadm utility" +set name=info.classification value=org.opensolaris.category.2008:System/Core +set name=variant.arch value=$(ARCH) +dir path=sbin group=sys +dir path=usr group=sys +dir path=usr/include +dir path=usr/lib +dir path=usr/lib/python2.6 +dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/beadm +dir path=usr/sbin +dir path=usr/share group=sys +file path=sbin/beadm mode=0555 +file path=usr/include/libbe.h +file path=usr/lib/libbe.so.1 +file path=usr/lib/llib-lbe +file path=usr/lib/llib-lbe.ln +file path=usr/lib/python2.6/vendor-packages/beadm/BootEnvironment.py mode=0444 +file path=usr/lib/python2.6/vendor-packages/beadm/BootEnvironment.pyc \ + mode=0444 +file path=usr/lib/python2.6/vendor-packages/beadm/__init__.py mode=0444 +file path=usr/lib/python2.6/vendor-packages/beadm/__init__.pyc mode=0444 +file path=usr/lib/python2.6/vendor-packages/beadm/messages.py mode=0444 +file path=usr/lib/python2.6/vendor-packages/beadm/messages.pyc mode=0444 +file path=usr/lib/python2.6/vendor-packages/libbe_py.so +license cr_Sun license=cr_Sun +license lic_CDDL license=lic_CDDL +link path=usr/lib/libbe.so target=./libbe.so.1 +link path=usr/sbin/beadm target=../../sbin/beadm diff --git a/usr/src/pkg/manifests/library-demo-audio-samples.mf b/usr/src/pkg/manifests/library-demo-audio-samples.mf index 94c9409b65..153679dc34 100644 --- a/usr/src/pkg/manifests/library-demo-audio-samples.mf +++ b/usr/src/pkg/manifests/library-demo-audio-samples.mf @@ -71,11 +71,7 @@ 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" \ - hotline="Please contact your local service provider" \ - name="Audio Sound Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWaudf desc="SunOS audio sound files" name="Audio Sound Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/demo/SOUND/sounds target=../../share/audio/samples/au diff --git a/usr/src/pkg/manifests/library-libadt_jni.mf b/usr/src/pkg/manifests/library-libadt_jni.mf index 39a1102ab9..0342836132 100644 --- a/usr/src/pkg/manifests/library-libadt_jni.mf +++ b/usr/src/pkg/manifests/library-libadt_jni.mf @@ -39,11 +39,9 @@ file path=usr/lib/$(ARCH64)/llib-ladt_jni.ln file path=usr/lib/audit/Audit.jar file path=usr/lib/libadt_jni.so.1 file path=usr/lib/llib-ladt_jni.ln -legacy pkg=SUNWaudit arch=$(ARCH) category=system \ +legacy pkg=SUNWaudit \ desc="Java Solaris Auditing interface / AuditService Implementation" \ - hotline="Please contact your local service provider" \ - name="AuditService Implementation" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="AuditService Implementation" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libadt_jni.so target=./libadt_jni.so.1 diff --git a/usr/src/pkg/manifests/library-libtecla.mf b/usr/src/pkg/manifests/library-libtecla.mf index 7b51c396cd..e074640e8a 100644 --- a/usr/src/pkg/manifests/library-libtecla.mf +++ b/usr/src/pkg/manifests/library-libtecla.mf @@ -42,11 +42,9 @@ file path=usr/lib/$(ARCH64)/llib-ltecla.ln file path=usr/lib/libtecla.so.1 file path=usr/lib/llib-ltecla file path=usr/lib/llib-ltecla.ln -legacy pkg=SUNWtecla arch=$(ARCH) category=system \ - desc="Tecla command-line editing library" \ - hotline="Please contact your local service provider" \ - name="Tecla command-line editing library" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license lib/libtecla/THIRDPARTYLICENSE license=lib/libtecla/THIRDPARTYLICENSE +legacy pkg=SUNWtecla desc="Tecla command-line editing library" \ + name="Tecla command-line editing library" +license usr/src/lib/libtecla/THIRDPARTYLICENSE \ + license=usr/src/lib/libtecla/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libtecla.so target=libtecla.so.1 link path=usr/lib/libtecla.so target=libtecla.so.1 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 e525b33d3a..1d149196db 100644 --- a/usr/src/pkg/manifests/library-print-open-printing-ipp.mf +++ b/usr/src/pkg/manifests/library-print-open-printing-ipp.mf @@ -35,15 +35,14 @@ dir path=usr/lib dir path=usr/lib/print group=lp file path=usr/lib/print/libhttp-core.so.1 file path=usr/lib/print/psm-ipp.so.1 -legacy pkg=SUNWpsm-ipp arch=$(ARCH) category=system \ +legacy pkg=SUNWpsm-ipp \ desc="Client side support for communicating with IPP based print servers" \ - hotline="Please contact your local service provider" \ name="FSG Open Printing API IPP Print Service Module" \ - vendor="Sun Microsystems, Inc." version=11.11.0,REV=2009.11.11 + version=11.11.0,REV=2009.11.11 license cr_Sun license=cr_Sun -license lib/print/libhttp-core/common/LICENSE.txt \ - license=lib/print/libhttp-core/common/LICENSE.txt license lic_CDDL license=lic_CDDL +license usr/src/lib/print/libhttp-core/common/LICENSE.txt \ + license=usr/src/lib/print/libhttp-core/common/LICENSE.txt link path=usr/lib/print/libhttp-core.so target=./libhttp-core.so.1 link path=usr/lib/print/psm-http.so target=./psm-ipp.so link path=usr/lib/print/psm-ipp.so target=./psm-ipp.so.1 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 ce690655c9..ea8ade1ebb 100644 --- a/usr/src/pkg/manifests/library-print-open-printing-lpd.mf +++ b/usr/src/pkg/manifests/library-print-open-printing-lpd.mf @@ -36,11 +36,10 @@ dir path=usr/lib dir path=usr/lib/print group=lp file path=usr/lib/print/lpd-port mode=4511 file path=usr/lib/print/psm-lpd.so.1 -legacy pkg=SUNWpsm-lpd arch=$(ARCH) category=system \ +legacy pkg=SUNWpsm-lpd \ desc="Client side support for communicating with RFC-1179 based print servers" \ - hotline="Please contact your local service provider" \ name="FSG Open Printing API RFC-1179 Print Service Module" \ - vendor="Sun Microsystems, Inc." version=11.11.0,REV=2009.11.11 + version=11.11.0,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/print/psm-lpd.so target=./psm-lpd.so.1 diff --git a/usr/src/pkg/manifests/library-print-open-printing.mf b/usr/src/pkg/manifests/library-print-open-printing.mf index fd401fb8ca..5730267dc3 100644 --- a/usr/src/pkg/manifests/library-print-open-printing.mf +++ b/usr/src/pkg/manifests/library-print-open-printing.mf @@ -36,11 +36,9 @@ dir path=usr/lib file path=usr/include/papi.h file path=usr/lib/libpapi-common.so.0 file path=usr/lib/libpapi.so.0 -legacy pkg=SUNWpapi arch=$(ARCH) category=system \ - desc="Free Standards Group Open Printing API, Draft v0.9" \ - hotline="Please contact your local service provider" \ +legacy pkg=SUNWpapi desc="Free Standards Group Open Printing API, Draft v0.9" \ name="Free Standards Group Open Printing API" \ - vendor="Sun Microsystems, Inc." version=11.11.0,REV=2009.11.11 + version=11.11.0,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libpapi-common.so target=./libpapi-common.so.0 diff --git a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf index 60cde6c8fc..5cd98aa2d8 100644 --- a/usr/src/pkg/manifests/library-security-tcp-wrapper.mf +++ b/usr/src/pkg/manifests/library-security-tcp-wrapper.mf @@ -52,9 +52,8 @@ file path=usr/share/man/man4/hosts.allow.4 file path=usr/share/man/man4/hosts.deny.4 file path=usr/share/man/man4/hosts_access.4 file path=usr/share/man/man4/hosts_options.4 -legacy pkg=SUNWtcpd arch=$(ARCH) category=system \ +legacy pkg=SUNWtcpd \ desc="tcpd - access control facility for internet services" \ - hotline="Please contact your local service provider" \ - name="tcpd - access control facility for internet services" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/tcpd/THIRDPARTYLICENSE license=cmd/tcpd/THIRDPARTYLICENSE + name="tcpd - access control facility for internet services" +license usr/src/cmd/tcpd/THIRDPARTYLICENSE \ + license=usr/src/cmd/tcpd/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/media-cdrw.mf b/usr/src/pkg/manifests/media-cdrw.mf index e520d6729b..28573d957b 100644 --- a/usr/src/pkg/manifests/media-cdrw.mf +++ b/usr/src/pkg/manifests/media-cdrw.mf @@ -39,10 +39,8 @@ dir path=usr/lib/help/auths/locale dir path=usr/lib/help/auths/locale/C file path=usr/bin/cdrw mode=4755 file path=usr/lib/help/auths/locale/C/DevCDRW.html -legacy pkg=SUNWcdrw arch=$(ARCH) category=system \ +legacy pkg=SUNWcdrw \ desc="utility for writing to CD-R/RW and DVD{+-}R/RW disks" \ - hotline="Please contact your local service provider" \ - name="utility for writing to CD-R/RW and DVD{+-}R/RW disks" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="utility for writing to CD-R/RW and DVD{+-}R/RW disks" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/naming-ldap.mf b/usr/src/pkg/manifests/naming-ldap.mf index bafebffa28..b1f233a2e9 100644 --- a/usr/src/pkg/manifests/naming-ldap.mf +++ b/usr/src/pkg/manifests/naming-ldap.mf @@ -37,10 +37,9 @@ file path=usr/bin/ldapmodify mode=0555 file path=usr/bin/ldapmodrdn mode=0555 file path=usr/bin/ldapsearch mode=0555 hardlink path=usr/bin/ldapadd target=./ldapmodify -legacy pkg=SUNWlldap arch=$(ARCH) category=system \ +legacy pkg=SUNWlldap \ 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 -license cmd/ldap/THIRDPARTYLICENSE license=cmd/ldap/THIRDPARTYLICENSE + name="LDAP Libraries" license cr_Sun license=cr_Sun +license usr/src/cmd/ldap/THIRDPARTYLICENSE \ + license=usr/src/cmd/ldap/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/network-bridging.mf b/usr/src/pkg/manifests/network-bridging.mf index 21bf488dbd..b23c2ae48c 100644 --- a/usr/src/pkg/manifests/network-bridging.mf +++ b/usr/src/pkg/manifests/network-bridging.mf @@ -40,16 +40,11 @@ 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 -legacy pkg=SUNWbridger arch=$(ARCH) category=system \ - desc="Datalink layer bridging support" \ - hotline="Please contact your local service provider" \ - name="IEEE 802 Bridging Support (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWbridgeu arch=$(ARCH) category=system \ - desc="Datalink layer bridging support" \ - hotline="Please contact your local service provider" \ - name="IEEE 802 Bridging Support (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWbridger desc="Datalink layer bridging support" \ + name="IEEE 802 Bridging Support (Root)" +legacy pkg=SUNWbridgeu desc="Datalink layer bridging support" \ + name="IEEE 802 Bridging Support (Usr)" license cr_Sun license=cr_Sun -license lib/librstp/THIRDPARTYLICENSE license=lib/librstp/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/librstp/common/COPYING \ + license=usr/src/lib/librstp/common/COPYING diff --git a/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf b/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf index 18683a6666..ef720887f3 100644 --- a/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf +++ b/usr/src/pkg/manifests/network-dhcp-dhcpmgr.mf @@ -97,10 +97,8 @@ file path=usr/sadm/admin/dhcpmgr/help/dhcp_relay_unconfig.html mode=0444 file path=usr/sadm/admin/dhcpmgr/help/dhcp_server_serv.html mode=0444 file path=usr/sadm/admin/dhcpmgr/help/dhcp_server_unconfig.html mode=0444 file path=usr/sadm/admin/dhcpmgr/help/dhcp_solaris_about.html mode=0444 -legacy pkg=SUNWdhcm arch=$(ARCH) category=system \ - desc="Graphical management interface for the DHCP server" \ - hotline="Please contact your local service provider" name="DHCP Manager" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWdhcm desc="Graphical management interface for the DHCP server" \ + name="DHCP Manager" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/sbin/dhcpmgr target=../sadm/admin/bin/dhcpmgr diff --git a/usr/src/pkg/manifests/network-ftp.mf b/usr/src/pkg/manifests/network-ftp.mf index 557afb5de2..b547130b9a 100644 --- a/usr/src/pkg/manifests/network-ftp.mf +++ b/usr/src/pkg/manifests/network-ftp.mf @@ -38,18 +38,12 @@ file path=etc/default/ftp group=sys original_name=SUNWbip:etc/default/ftp \ preserve=true file path=usr/bin/ftp mode=0555 file path=usr/sbin/ping mode=4555 -legacy pkg=SUNWbip arch=$(ARCH) category=system \ - desc="Basic IP commands (/usr/sbin/ping, /bin/ftp)" \ - 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)" \ - hotline="Please contact your local service provider" \ - name="Basic IP commands (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE +legacy pkg=SUNWbip desc="Basic IP commands (/usr/sbin/ping, /bin/ftp)" \ + name="Basic IP commands (Usr)" +legacy pkg=SUNWbipr desc="Basic IP commands (Root)" \ + name="Basic IP commands (Root)" license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.bin/ftp/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf index e46f632335..75e7a3ef47 100644 --- a/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf +++ b/usr/src/pkg/manifests/network-ipfilter-header-ipfilter.mf @@ -50,10 +50,8 @@ file path=usr/include/netinet/ip_proxy.h file path=usr/include/netinet/ip_state.h file path=usr/include/netinet/ipf_stack.h file path=usr/include/netinet/ipl.h -legacy pkg=SUNWipfh arch=$(ARCH) category=system \ - desc="C header files for IP Filter" \ - hotline="Please contact your local service provider" \ - name="IP Filter header files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ipf/tools/IPFILTER.LICENCE license=cmd/ipf/tools/IPFILTER.LICENCE +legacy pkg=SUNWipfh desc="C header files for IP Filter" \ + name="IP Filter header files" license cr_Sun license=cr_Sun +license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \ + license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf index 57ba59aeed..1fdd20fb81 100644 --- a/usr/src/pkg/manifests/network-ipfilter.mf +++ b/usr/src/pkg/manifests/network-ipfilter.mf @@ -112,13 +112,10 @@ hardlink path=usr/sbin/ipfstat target=../../usr/lib/isaexec hardlink path=usr/sbin/ipmon target=../../usr/lib/isaexec hardlink path=usr/sbin/ipnat target=../../usr/lib/isaexec hardlink path=usr/sbin/ippool target=../../usr/lib/isaexec -legacy pkg=SUNWipfr arch=$(ARCH) category=system desc="IP Filter Utilities" \ - hotline="Please contact your local service provider" \ - name="IP Filter utilities, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWipfu arch=$(ARCH) category=system desc="IP Filter Utilities" \ - hotline="Please contact your local service provider" \ - name="IP Filter utilities, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ipf/tools/IPFILTER.LICENCE license=cmd/ipf/tools/IPFILTER.LICENCE +legacy pkg=SUNWipfr desc="IP Filter Utilities" \ + name="IP Filter utilities, (Root)" +legacy pkg=SUNWipfu desc="IP Filter Utilities" \ + name="IP Filter utilities, (Usr)" license cr_Sun license=cr_Sun +license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \ + license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.mf b/usr/src/pkg/manifests/network-iscsi-initiator.mf index 0b5ba9cdf6..7d80614b53 100644 --- a/usr/src/pkg/manifests/network-iscsi-initiator.mf +++ b/usr/src/pkg/manifests/network-iscsi-initiator.mf @@ -55,15 +55,9 @@ 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 -legacy pkg=SUNWiscsir arch=$(ARCH) category=system \ - desc="Sun iSCSI Device Driver" \ - hotline="Please contact your local service provider" \ - name="Sun iSCSI Device Driver (root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -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 +legacy pkg=SUNWiscsir desc="Sun iSCSI Device Driver" \ + name="Sun iSCSI Device Driver (root)" +legacy pkg=SUNWiscsiu desc="Sun iSCSI Management Utilities" \ + name="Sun iSCSI Management Utilities (usr)" 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 2ad07f40df..621e564590 100644 --- a/usr/src/pkg/manifests/network-iscsi-iser.mf +++ b/usr/src/pkg/manifests/network-iscsi-iser.mf @@ -57,15 +57,9 @@ 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 \ - desc="Sun iSCSI Data Mover (Root)" \ - hotline="Please contact your local service provider" \ - name="Sun iSCSI Data Mover (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWiscsidmu arch=$(ARCH) category=system \ - desc="Sun iSCSI Data Mover (Usr)" \ - hotline="Please contact your local service provider" \ - name="Sun iSCSI Data Mover (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWiscsidmr desc="Sun iSCSI Data Mover (Root)" \ + name="Sun iSCSI Data Mover (Root)" +legacy pkg=SUNWiscsidmu desc="Sun iSCSI Data Mover (Usr)" \ + name="Sun iSCSI Data Mover (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.mf index 18608ec3e0..801bf0c84f 100644 --- a/usr/src/pkg/manifests/network-iscsi-target.mf +++ b/usr/src/pkg/manifests/network-iscsi-target.mf @@ -62,16 +62,10 @@ 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 -legacy pkg=SUNWiscsitr arch=$(ARCH) category=system \ - desc="Sun iSCSI COMSTAR Port Provider" \ - hotline="Please contact your local service provider" \ - name="Sun iSCSI COMSTAR Port Provider (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWiscsitu arch=$(ARCH) category=system \ - desc="Sun iSCSI COMSTAR Port Provider" \ - hotline="Please contact your local service provider" \ - name="Sun iSCSI COMSTAR Port Provider" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWiscsitr desc="Sun iSCSI COMSTAR Port Provider" \ + name="Sun iSCSI COMSTAR Port Provider (root)" +legacy pkg=SUNWiscsitu desc="Sun iSCSI COMSTAR Port Provider" \ + name="Sun iSCSI COMSTAR Port Provider" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libiscsit.so target=libiscsit.so.1 diff --git a/usr/src/pkg/manifests/network-netcat.mf b/usr/src/pkg/manifests/network-netcat.mf index 01d5a78e3f..6385b1d1a5 100644 --- a/usr/src/pkg/manifests/network-netcat.mf +++ b/usr/src/pkg/manifests/network-netcat.mf @@ -32,9 +32,6 @@ set name=variant.arch value=$(ARCH) 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 -license cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE +legacy pkg=SUNWnetcat desc="Netcat Command" name="Netcat Command" +license usr/src/cmd/cmd-inet/usr.bin/nc/THIRDPARTYLICENSE \ + license=usr/src/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 cbc87b5cde..204c90628f 100644 --- a/usr/src/pkg/manifests/network-ssh-ssh-key.mf +++ b/usr/src/pkg/manifests/network-ssh-ssh-key.mf @@ -36,9 +36,7 @@ dir path=usr/lib/ssh file path=usr/bin/ssh-keygen mode=0555 file path=usr/bin/ssh-keyscan mode=0555 file path=usr/lib/ssh/ssh-keysign mode=4555 -legacy pkg=SUNWsshcu arch=$(ARCH) category=system \ - desc="Secure Shell protocol common Utilities" \ - hotline="Please contact your local service provider" \ - name="SSH Common, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ssh/THIRDPARTYLICENSE license=cmd/ssh/THIRDPARTYLICENSE +legacy pkg=SUNWsshcu desc="Secure Shell protocol common Utilities" \ + name="SSH Common, (Usr)" +license usr/src/cmd/ssh/THIRDPARTYLICENSE \ + license=usr/src/cmd/ssh/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/network-ssh.mf b/usr/src/pkg/manifests/network-ssh.mf index 950176cd34..71ec61a5b8 100644 --- a/usr/src/pkg/manifests/network-ssh.mf +++ b/usr/src/pkg/manifests/network-ssh.mf @@ -47,14 +47,11 @@ file path=usr/bin/ssh-agent mode=0555 file path=usr/lib/ssh/ssh-askpass mode=0555 file path=usr/lib/ssh/ssh-http-proxy-connect mode=0555 file path=usr/lib/ssh/ssh-socks5-proxy-connect mode=0555 -legacy pkg=SUNWsshr arch=$(ARCH) category=system \ +legacy pkg=SUNWsshr \ desc="Secure Shell protocol Client and associated Utilities" \ - hotline="Please contact your local service provider" \ - name="SSH Client and utilities, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsshu arch=$(ARCH) category=system \ + name="SSH Client and utilities, (Root)" +legacy pkg=SUNWsshu \ desc="Secure Shell protocol Client and associated Utilities" \ - hotline="Please contact your local service provider" \ - name="SSH Client and utilities, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ssh/THIRDPARTYLICENSE license=cmd/ssh/THIRDPARTYLICENSE + name="SSH Client and utilities, (Usr)" +license usr/src/cmd/ssh/THIRDPARTYLICENSE \ + license=usr/src/cmd/ssh/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/network-telnet.mf b/usr/src/pkg/manifests/network-telnet.mf index 3de9029d8d..ce6fe1429d 100644 --- a/usr/src/pkg/manifests/network-telnet.mf +++ b/usr/src/pkg/manifests/network-telnet.mf @@ -32,11 +32,8 @@ set name=variant.arch value=$(ARCH) 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)" \ - hotline="Please contact your local service provider" \ - name="Telnet Command (client)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE +legacy pkg=SUNWtnetc desc="Telnet Command (client)" \ + name="Telnet Command (client)" license cr_Sun license=cr_Sun +license usr/src/cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.bin/telnet/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/package-svr4.mf b/usr/src/pkg/manifests/package-svr4.mf index 8d02a69bec..37662dab41 100644 --- a/usr/src/pkg/manifests/package-svr4.mf +++ b/usr/src/pkg/manifests/package-svr4.mf @@ -81,18 +81,15 @@ file path=var/sadm/install/admin/default 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 -legacy pkg=SUNWpkgcmdsr arch=$(ARCH) category=system \ +legacy pkg=SUNWpkgcmdsr \ desc="Solaris System V release 4 Package Commands (root)" \ - hotline="Please contact your local service provider" \ - name="SVr4 package commands (root)" vendor="Sun Microsystems, Inc." \ - version=11.11.1,REV=2009.11.11 -legacy pkg=SUNWpkgcmdsu arch=$(ARCH) category=system \ + name="SVr4 package commands (root)" version=11.11.1,REV=2009.11.11 +legacy pkg=SUNWpkgcmdsu \ desc="Solaris System V Release 4 Packaging Commands (usr)" \ - hotline="Please contact your local service provider" \ - name="SVr4 packaging commands (usr)" vendor="Sun Microsystems, Inc." \ - version=11.11.1,REV=2009.11.11 + name="SVr4 packaging commands (usr)" version=11.11.1,REV=2009.11.11 license cr_ATT license=cr_ATT license cr_Sun license=cr_Sun -license lib/libpkg/THIRDPARTYLICENSE license=lib/libpkg/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/libpkg/THIRDPARTYLICENSE \ + license=usr/src/lib/libpkg/THIRDPARTYLICENSE link path=usr/lib/libpkg.so target=./libpkg.so.1 diff --git a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf index d8785edba9..0608a1589b 100644 --- a/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf +++ b/usr/src/pkg/manifests/print-lp-compatibility-sunos4.mf @@ -32,15 +32,14 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/ucb -legacy pkg=SUNWscplp arch=$(ARCH) category=system \ +legacy pkg=SUNWscplp \ desc="print utilities for user interface and source build compatibility with SunOS 4.x" \ - hotline="Please contact your local service provider" \ name="Solaris Print - Source Compatibility, (Usr)" \ - vendor="Sun Microsystems, Inc." version=13.1,REV=2009.11.11 -license cmd/lp/cmd/lptest/THIRDPARTYLICENSE \ - license=cmd/lp/cmd/lptest/THIRDPARTYLICENSE + version=13.1,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/lp/cmd/lptest/THIRDPARTYLICENSE \ + license=usr/src/cmd/lp/cmd/lptest/THIRDPARTYLICENSE link path=usr/ucb/lpc target=../bin/lpc link path=usr/ucb/lpq target=../bin/lpq link path=usr/ucb/lpr target=../bin/lpr 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 79d4db8659..136e44bab1 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 @@ -61,10 +61,8 @@ file path=usr/lib/lp/postscript/postreverse group=lp mode=0555 file path=usr/lib/lp/postscript/posttek group=lp mode=0555 file path=usr/lib/lp/postscript/posttek.ps group=lp mode=0555 file path=usr/lib/lp/postscript/ps.requests group=lp mode=0555 -legacy pkg=SUNWpsf arch=$(ARCH) category=system \ +legacy pkg=SUNWpsf \ desc="client configuration files and utilities for the print service" \ - hotline="Please contact your local service provider" \ - name="PostScript filters - (Usr)" vendor="Sun Microsystems, Inc." \ - version=13.1,REV=2009.11.11 + name="PostScript filters - (Usr)" version=13.1,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 f08e1e9941..fe8c53ad36 100644 --- a/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf +++ b/usr/src/pkg/manifests/print-lp-ipp-ipp-listener.mf @@ -49,15 +49,13 @@ 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 \ +legacy pkg=SUNWipplr \ desc="Internet Printing Protocol(IPP) Apache configuration for service module" \ - hotline="Please contact your local service provider" \ name="Internet Printing Protocol(IPP) listener, (root)" \ - vendor="Sun Microsystems, Inc." version=13.1,REV=2009.11.11 -legacy pkg=SUNWipplu arch=$(ARCH) category=system \ + version=13.1,REV=2009.11.11 +legacy pkg=SUNWipplu \ desc="Internet Printing Protocol(IPP) Apache module for listening service" \ - hotline="Please contact your local service provider" \ name="Internet Printing Protocol(IPP) listener module (/usr)" \ - vendor="Sun Microsystems, Inc." version=13.1,REV=2009.11.11 + version=13.1,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/print-lp-ipp-libipp.mf b/usr/src/pkg/manifests/print-lp-ipp-libipp.mf index ca3f73b58a..1de66b84cd 100644 --- a/usr/src/pkg/manifests/print-lp-ipp-libipp.mf +++ b/usr/src/pkg/manifests/print-lp-ipp-libipp.mf @@ -34,11 +34,10 @@ dir path=usr group=sys dir path=usr/lib file path=usr/lib/libipp-core.so.0 file path=usr/lib/libipp-listener.so.0 -legacy pkg=SUNWippcore arch=$(ARCH) category=system \ +legacy pkg=SUNWippcore \ desc="Internet Print Protocol (IPP) encoding/decoding/operation support" \ - hotline="Please contact your local service provider" \ name="Internet Printing Protocol(IPP) core libraries, (usr)" \ - vendor="Sun Microsystems, Inc." version=13.1,REV=2009.11.11 + version=13.1,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libipp-core.so target=./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 8d3d12bfee..c4a37e7499 100644 --- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf +++ b/usr/src/pkg/manifests/print-lp-print-client-commands.mf @@ -48,11 +48,9 @@ file path=usr/sbin/print-service mode=0555 file path=usr/share/applications/desktop-print-management-prefs.desktop file path=usr/share/applications/desktop-print-management.desktop file path=usr/share/gnome/autostart/desktop-print-management-applet.desktop -legacy pkg=SUNWpcu arch=$(ARCH) category=system \ +legacy pkg=SUNWpcu \ desc="client configuration files and utilities for the print service" \ - hotline="Please contact your local service provider" \ - name="Solaris Print - Client, (usr)" vendor="Sun Microsystems, Inc." \ - version=13.1,REV=2009.11.11 + name="Solaris Print - Client, (usr)" version=13.1,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/bin/cancel target=../sbin/print-service 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 1cb8f5e097..c1584e85e5 100644 --- a/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf +++ b/usr/src/pkg/manifests/print-lp-print-manager-legacy.mf @@ -66,16 +66,10 @@ 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 -legacy pkg=SUNWppm arch=$(ARCH) category=system \ - desc="Graphical tool for managing printers under Solaris." \ - hotline="Please contact your local service provider" \ - name="Solaris Print Manager" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWppmr arch=$(ARCH) category=system \ - desc="Graphical tool for managing printers under Solaris." \ - hotline="Please contact your local service provider" \ - name="Solaris Print Manager (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWppm desc="Graphical tool for managing printers under Solaris." \ + name="Solaris Print Manager" +legacy pkg=SUNWppmr desc="Graphical tool for managing printers under Solaris." \ + name="Solaris Print Manager (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/sadm/admin/printmgr/lib/libpmgr.so target=./libpmgr.so.1 diff --git a/usr/src/pkg/manifests/print-lp.mf b/usr/src/pkg/manifests/print-lp.mf index ad8312cba4..48f1371177 100644 --- a/usr/src/pkg/manifests/print-lp.mf +++ b/usr/src/pkg/manifests/print-lp.mf @@ -333,16 +333,12 @@ hardlink path=usr/share/lib/terminfo/a/att593hp \ target=../../../../../usr/share/lib/terminfo/5/593hp hardlink path=usr/share/lib/terminfo/a/att593ibm \ target=../../../../../usr/share/lib/terminfo/5/593ibm -legacy pkg=SUNWpsr arch=$(ARCH) category=system \ +legacy pkg=SUNWpsr \ desc="configuration and start-up files for the print service" \ - hotline="Please contact your local service provider" \ - name="Solaris Print - LP Server, (root)" vendor="Sun Microsystems, Inc." \ - version=13.1,REV=2009.11.11 -legacy pkg=SUNWpsu arch=$(ARCH) category=system \ + name="Solaris Print - LP Server, (root)" version=13.1,REV=2009.11.11 +legacy pkg=SUNWpsu \ desc="client configuration files and utilities for the print service" \ - hotline="Please contact your local service provider" \ - name="Solaris Print - LP Server, (usr)" vendor="Sun Microsystems, Inc." \ - version=13.1,REV=2009.11.11 + name="Solaris Print - LP Server, (usr)" version=13.1,REV=2009.11.11 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=etc/lp/logs target=../../var/lp/logs diff --git a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf index 1e74c66bbb..ae411adc74 100644 --- a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf +++ b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf @@ -23,6 +23,11 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # +$(i386_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT i86pc> +$(sparc_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT sun4> + +<transform file path=.*\.(pm|bs) -> default mode 0444> +<transform file path=.*\.so -> default mode 0555> set name=pkg.fmri \ value=pkg:/runtime/perl-510/module/sun-solaris@0.5.11,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.summary value="Perl 5.10.0 Sun::Solaris Modules" @@ -30,24 +35,12 @@ 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 - -$(i386_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT i86pc> -$(sparc_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT sun4> - -<transform file path=.*\.(pm|bs) -> default mode 0444> -<transform file path=.*\.so -> default mode 0555> - dir path=usr group=sys dir path=usr/bin dir path=usr/perl5 dir path=usr/perl5/5.10.0 dir path=usr/perl5/5.10.0/bin dir path=usr/perl5/5.10.0/lib -dir path=usr/perl5/5.10.0/lib/Sun -dir path=usr/perl5/5.10.0/lib/Sun/Solaris -dir path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM -dir path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc - dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris @@ -55,63 +48,96 @@ dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM +dir \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM/_BSMparse +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct +dir \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File +dir \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/PerlGcc +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Pg dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task +dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/PerlGcc -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM/_BSMparse -dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat - +dir path=usr/perl5/5.10.0/lib/Sun +dir path=usr/perl5/5.10.0/lib/Sun/Solaris +dir path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM +dir path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc file path=usr/perl5/5.10.0/bin/perlgcc mode=0555 -file path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM/_BSMparse.pm -file path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc/Config.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Intrs.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Task.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Lgrp.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Ucred.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Utils.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Kstat.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Catalog.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/File.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Object.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Privilege.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Project.pm -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.so -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.bs -file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so - -license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct.pm +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Catalog.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/File.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Object.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Intrs.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Kstat.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Lgrp.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Privilege.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Project.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Task.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Ucred.pm +file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Utils.pm +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs +file \ + path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so +file path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM/_BSMparse.pm +file path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc/Config.pm +file path=usr/perl5/5.10.0/lib/Sun/Solaris/Pg.pm license cr_Sun license=cr_Sun +license usr/src/cmd/perl/THIRDPARTYLICENSE \ + license=usr/src/cmd/perl/THIRDPARTYLICENSE depend fmri=runtime/perl-510 type=require depend fmri=runtime/perl-510/extra type=require diff --git a/usr/src/pkg/manifests/runtime-perl-584-extra.mf b/usr/src/pkg/manifests/runtime-perl-584-extra.mf index 0d4fa142ba..8317d4ddec 100644 --- a/usr/src/pkg/manifests/runtime-perl-584-extra.mf +++ b/usr/src/pkg/manifests/runtime-perl-584-extra.mf @@ -1508,11 +1508,9 @@ file path=usr/perl5/5.8.4/lib/utf8_heavy.pl mode=0444 file path=usr/perl5/5.8.4/lib/validate.pl mode=0444 hardlink path=usr/perl5/5.8.4/bin/psed target=s2p hardlink path=usr/perl5/5.8.4/bin/pstruct target=c2ph -legacy pkg=SUNWperl584usr arch=$(ARCH) category=system \ - desc="Perl 5.8.4 programming language (non-core)" \ - hotline="Please contact your local service provider" \ - name="Perl 5.8.4 (non-core)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE +legacy pkg=SUNWperl584usr desc="Perl 5.8.4 programming language (non-core)" \ + name="Perl 5.8.4 (non-core)" license cr_Sun license=cr_Sun +license usr/src/cmd/perl/THIRDPARTYLICENSE \ + license=usr/src/cmd/perl/THIRDPARTYLICENSE link path=usr/perl5/pod target=./5.8.4/lib/pod diff --git a/usr/src/pkg/manifests/runtime-perl-584.mf b/usr/src/pkg/manifests/runtime-perl-584.mf index 2b7218ba7d..d784e76034 100644 --- a/usr/src/pkg/manifests/runtime-perl-584.mf +++ b/usr/src/pkg/manifests/runtime-perl-584.mf @@ -336,6 +336,7 @@ file path=usr/perl5/5.8.4/lib/Sun/Solaris/Exacct/Object.pm mode=0444 file path=usr/perl5/5.8.4/lib/Sun/Solaris/Intrs.pm mode=0444 file path=usr/perl5/5.8.4/lib/Sun/Solaris/Kstat.pm mode=0444 file path=usr/perl5/5.8.4/lib/Sun/Solaris/Lgrp.pm mode=0444 +file path=usr/perl5/5.8.4/lib/Sun/Solaris/Pg.pm mode=0444 file path=usr/perl5/5.8.4/lib/Sun/Solaris/Privilege.pm mode=0444 file path=usr/perl5/5.8.4/lib/Sun/Solaris/Project.pm mode=0444 file path=usr/perl5/5.8.4/lib/Sun/Solaris/Task.pm mode=0444 @@ -1969,13 +1970,11 @@ file path=usr/perl5/5.8.4/lib/vmsish.pm mode=0444 file path=usr/perl5/5.8.4/lib/warnings.pm mode=0444 file path=usr/perl5/5.8.4/lib/warnings/register.pm mode=0444 hardlink path=usr/perl5/5.8.4/bin/perl target=./perl5.8.4 -legacy pkg=SUNWperl584core arch=$(ARCH) category=system \ - desc="Perl 5.8.4 programming language (core)" \ - hotline="Please contact your local service provider" \ - name="Perl 5.8.4 (core)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE +legacy pkg=SUNWperl584core desc="Perl 5.8.4 programming language (core)" \ + name="Perl 5.8.4 (core)" license cr_Sun license=cr_Sun +license usr/src/cmd/perl/THIRDPARTYLICENSE \ + license=usr/src/cmd/perl/THIRDPARTYLICENSE link path=usr/bin/perl target=../perl5/5.8.4/bin/perl $(i386_ONLY)link path=usr/perl5/5.8.4/lib/i86pc-solaris-64int/CORE/libperl.so \ target=./libperl.so.1 diff --git a/usr/src/pkg/manifests/security-bart.mf b/usr/src/pkg/manifests/security-bart.mf index 75b2e4ca5a..349dbe7204 100644 --- a/usr/src/pkg/manifests/security-bart.mf +++ b/usr/src/pkg/manifests/security-bart.mf @@ -32,10 +32,7 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/bin file path=usr/bin/bart mode=0555 -legacy pkg=SUNWbart arch=$(ARCH) category=system \ - desc="Basic Audit Reporting Tool (BART)" \ - hotline="Please contact your local service provider" \ - name="Basic Audit Reporting Tool" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWbart desc="Basic Audit Reporting Tool (BART)" \ + name="Basic Audit Reporting Tool" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf b/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf new file mode 100644 index 0000000000..04e9766edf --- /dev/null +++ b/usr/src/pkg/manifests/service-fault-management-smtp-notify.mf @@ -0,0 +1,52 @@ +# +# 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. +# + +set name=pkg.fmri value=pkg:/service/fault-management/smtp-notify@$(PKGVERS) +set name=pkg.description \ + value="smtp-notify is a small, lightweight daemon that subscribes to both software and FMA problem lifecycle events. Upon receipt of an event, it produces an email notification based on a set of notification preferences which are stored in the SMF service configuration repository." +set name=pkg.summary value="Email Notification Daemon for System Events" +set name=info.classification \ + value="org.opensolaris.category.2010:System/Administration and Configuration" +set name=variant.arch value=$(ARCH) +set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/fm group=sys +dir path=usr/lib +dir path=usr/lib/fm +dir path=usr/lib/fm/notify +file path=lib/svc/manifest/system/fm/smtp-notify.xml group=sys mode=0444 +file path=usr/lib/fm/notify/process_msg_template.sh mode=0555 +file path=usr/lib/fm/notify/smtp-notify mode=0555 +license cr_Sun license=cr_Sun +license lic_CDDL license=lic_CDDL +# +# snmp-notify depends on libraries delivered in this package +# +depend fmri=service/fault-management type=require +# +# snmp-notify requires the sendmail-client service in order to be able to send +# email notifications. +# +depend fmri=service/network/smtp/sendmail type=require diff --git a/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf b/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf new file mode 100644 index 0000000000..85504febae --- /dev/null +++ b/usr/src/pkg/manifests/service-fault-management-snmp-notify.mf @@ -0,0 +1,51 @@ +# +# 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. +# + +set name=pkg.fmri value=pkg:/service/fault-management/snmp-notify@$(PKGVERS) +set name=pkg.description \ + value="snmp-notify is a small, lightweight daemon that subscribes to both software and FMA problem lifecycle events. Upon receipt of an event, it produces an SNMP notification based on a set of notification preferences which are stored in the SMF service configuration repository." +set name=pkg.summary value="SNMP Notification Daemon for System Events" +set name=info.classification \ + value="org.opensolaris.category.2010:System/Administration and Configuration" +set name=variant.arch value=$(ARCH) +set name=variant.opensolaris.zone value=global value=nonglobal +dir path=lib/svc/manifest/system group=sys +dir path=lib/svc/manifest/system/fm group=sys +dir path=usr/lib +dir path=usr/lib/fm +dir path=usr/lib/fm/notify +file path=lib/svc/manifest/system/fm/snmp-notify.xml group=sys mode=0444 +file path=usr/lib/fm/notify/snmp-notify mode=0555 +license cr_Sun license=cr_Sun +license lic_CDDL license=lic_CDDL +# +# snmp-notify depends on libraries delivered in this package +# +depend fmri=service/fault-management type=require +# +# snmp-notify requires the net-snmp service in order to be able to send +# SNMP notifications. +# +depend fmri=system/management/snmp/net-snmp type=require diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index 6bc32ace9d..0806857b62 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -35,33 +35,72 @@ 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) -dir path=etc group=sys -dir path=etc/fm group=sys -dir path=etc/fm/fmd group=sys -dir path=etc/net-snmp -dir path=etc/net-snmp/snmp -dir path=etc/net-snmp/snmp/mibs +# +# Start by describing our directory structure. +# +# The snmp mibs are common to global and non-global zones +# +dir path=etc group=sys variant.opensolaris.zone=__NODEFAULT +dir path=etc/fm group=sys variant.opensolaris.zone=__NODEFAULT +dir path=etc/fm/fmd group=sys variant.opensolaris.zone=__NODEFAULT +# +# Our additional /etc/logadm.conf entries are common to global and local zones +# +dir path=etc/logadm.d group=sys variant.opensolaris.zone=__NODEFAULT +dir path=etc/net-snmp variant.opensolaris.zone=__NODEFAULT +dir path=etc/net-snmp/snmp variant.opensolaris.zone=__NODEFAULT +dir path=etc/net-snmp/snmp/mibs variant.opensolaris.zone=__NODEFAULT +# +# Our kernel driver is global zone only +# dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys -dir path=usr group=sys +# +# lib dirs: +# +dir path=lib/fm variant.opensolaris.zone=__NODEFAULT +dir path=lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT +# +# Our service manifests are common to global and non-global zones +# +dir path=lib/svc/manifest/system group=sys \ + variant.opensolaris.zone=__NODEFAULT +dir path=lib/svc/manifest/system/fm group=sys \ + variant.opensolaris.zone=__NODEFAULT + +# +# usr dirs: +# - most are common to both global and non-global zones +# - those mentioning 'include' will automatically apply to both +# - dictionaries are delivered to both contexts, even if they +# are hardware dictionaries +# - eversholt rules (eft) are global zone only +# - some plugins and all schemes apply to both contexts +# - we don't deliver any topo maps to non-global zones, but we +# create the directory nonetheless; similarly for topo plugins +# - paths mentioning mdb will automatically apply to both +# - usr/platform is global zone only +# +dir path=usr group=sys variant.opensolaris.zone=__NODEFAULT dir path=usr/include dir path=usr/include/fm -dir path=usr/lib -dir path=usr/lib/fm -dir path=usr/lib/fm/$(ARCH64) -dir path=usr/lib/fm/dict +dir path=usr/lib variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/dict variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/fm/eft -dir path=usr/lib/fm/fmd -dir path=usr/lib/fm/fmd/plugins -dir path=usr/lib/fm/fmd/schemes -dir path=usr/lib/fm/fmd/schemes/$(ARCH64) -dir path=usr/lib/fm/topo -dir path=usr/lib/fm/topo/maps -dir path=usr/lib/fm/topo/plugins -dir path=usr/lib/locale -dir path=usr/lib/locale/C -dir path=usr/lib/locale/C/LC_MESSAGES +dir path=usr/lib/fm/fmd variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/fmd/plugins variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/fmd/schemes variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/fmd/schemes/$(ARCH64) variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/notify variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/topo variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/topo/maps variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/fm/topo/plugins variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/locale variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/locale/C variant.opensolaris.zone=__NODEFAULT +dir path=usr/lib/locale/C/LC_MESSAGES variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/proc group=sys dir path=usr/platform group=sys @@ -186,22 +225,67 @@ $(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/fmd/plugins $(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo $(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo/maps $(sparc_ONLY)dir path=usr/platform/sun4v/lib/fm/topo/plugins -dir path=usr/sbin -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/fm group=sys -dir path=var/fm/fmd group=sys -dir path=var/fm/fmd/ckpt group=sys -dir path=var/fm/fmd/rsrc group=sys -dir path=var/fm/fmd/xprt group=sys +# +# Some directories common to both global and non-global zones: +# +dir path=usr/sbin variant.opensolaris.zone=__NODEFAULT +dir path=usr/share group=sys variant.opensolaris.zone=__NODEFAULT +dir path=usr/share/lib group=sys variant.opensolaris.zone=__NODEFAULT +dir path=usr/share/lib/xml group=sys variant.opensolaris.zone=__NODEFAULT +dir path=usr/share/lib/xml/dtd group=sys variant.opensolaris.zone=__NODEFAULT +dir path=var/fm group=sys variant.opensolaris.zone=__NODEFAULT +dir path=var/fm/fmd group=sys variant.opensolaris.zone=__NODEFAULT +dir path=var/fm/fmd/ckpt group=sys variant.opensolaris.zone=__NODEFAULT +dir path=var/fm/fmd/rsrc group=sys variant.opensolaris.zone=__NODEFAULT +dir path=var/fm/fmd/xprt group=sys variant.opensolaris.zone=__NODEFAULT +# +# driver is global-zone only +# driver name=fm perms="* 0644 root sys" -file path=etc/net-snmp/snmp/fmd-trapgen.conf mode=0600 -file path=etc/net-snmp/snmp/mibs/SUN-FM-MIB.mib +# +# Our additional /etc/logadm.conf entries are common to global and local zones +# +file path=etc/logadm.d/fmd.logadm.conf group=sys mode=0444 \ + refresh_fmri=svc:/system/logadm-upgrade:default \ + variant.opensolaris.zone=__NODEFAULT +# +# Now for our file and link payloads +# +# snmp MIBs are common to both global and non-global zones +# +file path=etc/net-snmp/snmp/mibs/SUN-FM-MIB.mib \ + variant.opensolaris.zone=__NODEFAULT +file path=etc/net-snmp/snmp/mibs/SUN-IREPORT-MIB.mib \ + variant.opensolaris.zone=__NODEFAULT +# +# driver is global-zone only +# 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 + +# +# Some libraries need to be in lib for install +# +file path=lib/fm/$(ARCH64)/libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=lib/fm/$(ARCH64)/llib-lfmevent.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=lib/fm/libfmevent.so.1 variant.opensolaris.zone=__NODEFAULT +file path=lib/fm/llib-lfmevent variant.opensolaris.zone=__NODEFAULT +file path=lib/fm/llib-lfmevent.ln variant.opensolaris.zone=__NODEFAULT +# +# Service manifests are common to both global and non-global zones +# +file path=lib/svc/manifest/system/fm/notify-params.xml group=sys mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=lib/svc/manifest/system/fmd.xml group=sys mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +# +# Headers are automatically included in both contexts. +# While some of these are from global-zone-only components +# there's no harm in including them in both contexts. +# file path=usr/include/fm/diagcode.h file path=usr/include/fm/fmd_adm.h file path=usr/include/fm/fmd_agent.h @@ -212,53 +296,106 @@ file path=usr/include/fm/fmd_msg.h file path=usr/include/fm/fmd_snmp.h file path=usr/include/fm/libdiskstatus.h file path=usr/include/fm/libfmevent.h +file path=usr/include/fm/libfmevent_ruleset.h file path=usr/include/fm/libseslog.h file path=usr/include/fm/libtopo.h file path=usr/include/fm/topo_hc.h file path=usr/include/fm/topo_list.h file path=usr/include/fm/topo_method.h file path=usr/include/fm/topo_mod.h -file path=usr/lib/fm/$(ARCH64)/libdiagcode.so.1 -file path=usr/lib/fm/$(ARCH64)/libdiskstatus.so.1 -file path=usr/lib/fm/$(ARCH64)/libfmd_adm.so.1 -file path=usr/lib/fm/$(ARCH64)/libfmd_agent.so.1 -file path=usr/lib/fm/$(ARCH64)/libfmd_log.so.1 -file path=usr/lib/fm/$(ARCH64)/libfmd_msg.so.1 -file path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so.1 -file path=usr/lib/fm/$(ARCH64)/libfmevent.so.1 +# +# 64-bit .so.1 +# +file path=usr/lib/fm/$(ARCH64)/libdiagcode.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libdiskstatus.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libfmd_adm.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libfmd_agent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libfmd_log.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libfmd_msg.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so.1 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/libfmnotify.so.1 \ + variant.opensolaris.zone=__NODEFAULT $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/libldom.so.1 $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/libmdesc.so.1 file path=usr/lib/fm/$(ARCH64)/libseslog.so.1 -file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 -file path=usr/lib/fm/$(ARCH64)/llib-ldiagcode.ln -file path=usr/lib/fm/$(ARCH64)/llib-ldiskstatus.ln -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_adm.ln -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_agent.ln -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_log.ln -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_msg.ln -file path=usr/lib/fm/$(ARCH64)/llib-lfmd_snmp.ln -file path=usr/lib/fm/$(ARCH64)/llib-lfmevent.ln +file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 \ + variant.opensolaris.zone=__NODEFAULT +# +# 64-bit lint libraries +# +file path=usr/lib/fm/$(ARCH64)/llib-ldiagcode.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-ldiskstatus.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-lfmd_adm.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-lfmd_agent.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-lfmd_log.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-lfmd_msg.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-lfmd_snmp.ln \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/$(ARCH64)/llib-lfmnotify.ln \ + variant.opensolaris.zone=__NODEFAULT $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/llib-lldom.ln $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/llib-lmdesc.ln file path=usr/lib/fm/$(ARCH64)/llib-lseslog.ln -file path=usr/lib/fm/$(ARCH64)/llib-ltopo.ln -$(i386_ONLY)file path=usr/lib/fm/dict/AMD.dict mode=0444 -file path=usr/lib/fm/dict/DISK.dict mode=0444 -file path=usr/lib/fm/dict/FMD.dict mode=0444 -$(i386_ONLY)file path=usr/lib/fm/dict/GMCA.dict mode=0444 -$(i386_ONLY)file path=usr/lib/fm/dict/INTEL.dict mode=0444 -file path=usr/lib/fm/dict/NXGE.dict mode=0444 -file path=usr/lib/fm/dict/PCI.dict mode=0444 -file path=usr/lib/fm/dict/PCIEX.dict mode=0444 -$(sparc_ONLY)file path=usr/lib/fm/dict/SCF.dict mode=0444 -file path=usr/lib/fm/dict/SENSOR.dict mode=0444 -file path=usr/lib/fm/dict/STORAGE.dict mode=0444 -$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4.dict mode=0444 -$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4U.dict mode=0444 -$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4V.dict mode=0444 -file path=usr/lib/fm/dict/SUNOS.dict mode=0444 -file path=usr/lib/fm/dict/ZFS.dict mode=0444 -file path=usr/lib/fm/eft/disk.eft mode=0444 +file path=usr/lib/fm/$(ARCH64)/llib-ltopo.ln \ + variant.opensolaris.zone=__NODEFAULT +# +# Dictionaries, whether they are hardware-specific or not, are +# common to both global and non-global zones. +# +$(i386_ONLY)file path=usr/lib/fm/dict/AMD.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/DISK.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/FMD.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/FMNOTIFY.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(i386_ONLY)file path=usr/lib/fm/dict/GMCA.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(i386_ONLY)file path=usr/lib/fm/dict/INTEL.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/NXGE.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/PCI.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/PCIEX.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/fm/dict/SCF.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/SENSOR.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/SMF.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/STORAGE.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4U.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/fm/dict/SUN4V.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/SUNOS.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/dict/ZFS.dict mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +# +# Eversholt rules are global zone only +# +file path=usr/lib/fm/eft/disk.eft mode=0444 \ + variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/eft/neptune_xaui.eft mode=0444 file path=usr/lib/fm/eft/neptune_xfp.eft mode=0444 file path=usr/lib/fm/eft/pci.eft mode=0444 @@ -266,11 +403,24 @@ file path=usr/lib/fm/eft/pciex.eft mode=0444 file path=usr/lib/fm/eft/pciexrc.eft mode=0444 file path=usr/lib/fm/eft/sensor.eft mode=0444 file path=usr/lib/fm/eft/storage.eft mode=0444 -file path=usr/lib/fm/fmd/fmd mode=0555 -file path=usr/lib/fm/fmd/fminject mode=0555 -file path=usr/lib/fm/fmd/fmsim mode=0555 -file path=usr/lib/fm/fmd/fmtopo mode=0555 +# +# usr/lib/fm/fmd executables: +# - fmd is common, as are fminject, fmsim and fmtopo +# - ipmitopo is global zone only +# +file path=usr/lib/fm/fmd/fmd mode=0555 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/fminject mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/fmsim mode=0555 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/fmtopo mode=0555 variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/fmd/ipmitopo mode=0555 +# +# fmd plugins: +# - most are hardware-specific and so global zone only +# - ext-event-transport, ip-transport, syslog-msgs, +# software-diagnosis and software-response +# are common to both contexts +# file path=usr/lib/fm/fmd/plugins/cpumem-retire.conf file path=usr/lib/fm/fmd/plugins/cpumem-retire.so mode=0555 file path=usr/lib/fm/fmd/plugins/disk-monitor.conf @@ -279,110 +429,194 @@ file path=usr/lib/fm/fmd/plugins/disk-transport.conf file path=usr/lib/fm/fmd/plugins/disk-transport.so mode=0555 file path=usr/lib/fm/fmd/plugins/eft.conf file path=usr/lib/fm/fmd/plugins/eft.so mode=0555 -file path=usr/lib/fm/fmd/plugins/ext-event-transport.conf -file path=usr/lib/fm/fmd/plugins/ext-event-transport.so mode=0555 +file path=usr/lib/fm/fmd/plugins/ext-event-transport.conf \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/plugins/ext-event-transport.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/fmd/plugins/fabric-xlate.conf file path=usr/lib/fm/fmd/plugins/fabric-xlate.so mode=0555 file path=usr/lib/fm/fmd/plugins/fdd-msg.conf file path=usr/lib/fm/fmd/plugins/fdd-msg.so mode=0555 file path=usr/lib/fm/fmd/plugins/io-retire.conf file path=usr/lib/fm/fmd/plugins/io-retire.so mode=0555 -file path=usr/lib/fm/fmd/plugins/ip-transport.conf -file path=usr/lib/fm/fmd/plugins/ip-transport.so mode=0555 +file path=usr/lib/fm/fmd/plugins/ip-transport.conf \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/plugins/ip-transport.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/fmd/plugins/sensor-transport.conf file path=usr/lib/fm/fmd/plugins/sensor-transport.so mode=0555 file path=usr/lib/fm/fmd/plugins/ses-log-transport.conf file path=usr/lib/fm/fmd/plugins/ses-log-transport.so mode=0555 -file path=usr/lib/fm/fmd/plugins/snmp-trapgen.conf -file path=usr/lib/fm/fmd/plugins/snmp-trapgen.so mode=0555 +file path=usr/lib/fm/fmd/plugins/software-diagnosis.conf \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/plugins/software-diagnosis.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/plugins/software-response.conf \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/plugins/software-response.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/fmd/plugins/sp-monitor.conf file path=usr/lib/fm/fmd/plugins/sp-monitor.so mode=0555 -file path=usr/lib/fm/fmd/plugins/syslog-msgs.conf -file path=usr/lib/fm/fmd/plugins/syslog-msgs.so mode=0555 +file path=usr/lib/fm/fmd/plugins/syslog-msgs.conf \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/plugins/syslog-msgs.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/fmd/plugins/zfs-diagnosis.conf file path=usr/lib/fm/fmd/plugins/zfs-diagnosis.so mode=0555 file path=usr/lib/fm/fmd/plugins/zfs-retire.conf file path=usr/lib/fm/fmd/plugins/zfs-retire.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/cpu.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/dev.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/fmd.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/hc.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/legacy-hc.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mem.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mod.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/pkg.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/svc.so mode=0555 -file path=usr/lib/fm/fmd/schemes/$(ARCH64)/zfs.so mode=0555 -file path=usr/lib/fm/fmd/schemes/cpu.so mode=0555 -file path=usr/lib/fm/fmd/schemes/dev.so mode=0555 -file path=usr/lib/fm/fmd/schemes/fmd.so mode=0555 -file path=usr/lib/fm/fmd/schemes/hc.so mode=0555 -file path=usr/lib/fm/fmd/schemes/legacy-hc.so mode=0555 -file path=usr/lib/fm/fmd/schemes/mem.so mode=0555 -file path=usr/lib/fm/fmd/schemes/mod.so mode=0555 -file path=usr/lib/fm/fmd/schemes/pkg.so mode=0555 -file path=usr/lib/fm/fmd/schemes/svc.so mode=0555 -file path=usr/lib/fm/fmd/schemes/zfs.so mode=0555 -file path=usr/lib/fm/libdiagcode.so.1 -file path=usr/lib/fm/libdiskstatus.so.1 -file path=usr/lib/fm/libfmd_adm.so.1 -file path=usr/lib/fm/libfmd_agent.so.1 -file path=usr/lib/fm/libfmd_log.so.1 -file path=usr/lib/fm/libfmd_msg.so.1 -file path=usr/lib/fm/libfmd_snmp.so.1 -file path=usr/lib/fm/libfmevent.so.1 +# +# fmri scheme support: all are common to both global and non-global zones +# +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/cpu.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/dev.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/fmd.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/hc.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/legacy-hc.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mem.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mod.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/pkg.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/svc.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/sw.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/$(ARCH64)/zfs.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/cpu.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/dev.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/fmd.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/hc.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/legacy-hc.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/mem.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/mod.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/pkg.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/svc.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/sw.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/fmd/schemes/zfs.so mode=0555 \ + variant.opensolaris.zone=__NODEFAULT +# +# Libraries for usr/lib/fm; we include these in both global and non-global +# contexts except for the ldom and seslog libraries. +# +# +# 32-bit .so.1 +# +file path=usr/lib/fm/libdiagcode.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libdiskstatus.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libfmd_adm.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libfmd_agent.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libfmd_log.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libfmd_msg.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libfmd_snmp.so.1 variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/libfmnotify.so.1 variant.opensolaris.zone=__NODEFAULT $(sparc_ONLY)file path=usr/lib/fm/libldom.so.1 $(sparc_ONLY)file path=usr/lib/fm/libmdesc.so.1 file path=usr/lib/fm/libseslog.so.1 -file path=usr/lib/fm/libtopo.so.1 -file path=usr/lib/fm/llib-ldiagcode -file path=usr/lib/fm/llib-ldiagcode.ln -file path=usr/lib/fm/llib-ldiskstatus -file path=usr/lib/fm/llib-ldiskstatus.ln -file path=usr/lib/fm/llib-lfmd_adm -file path=usr/lib/fm/llib-lfmd_adm.ln -file path=usr/lib/fm/llib-lfmd_agent -file path=usr/lib/fm/llib-lfmd_agent.ln -file path=usr/lib/fm/llib-lfmd_log -file path=usr/lib/fm/llib-lfmd_log.ln -file path=usr/lib/fm/llib-lfmd_msg -file path=usr/lib/fm/llib-lfmd_msg.ln -file path=usr/lib/fm/llib-lfmd_snmp -file path=usr/lib/fm/llib-lfmd_snmp.ln -file path=usr/lib/fm/llib-lfmevent -file path=usr/lib/fm/llib-lfmevent.ln +file path=usr/lib/fm/libtopo.so.1 variant.opensolaris.zone=__NODEFAULT +# +# 32-bit lint libraries +# +file path=usr/lib/fm/llib-ldiagcode variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-ldiagcode.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-ldiskstatus variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-ldiskstatus.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_adm variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_adm.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_agent variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_agent.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_log variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_log.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_msg variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_msg.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_snmp variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmd_snmp.ln variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmnotify variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-lfmnotify.ln variant.opensolaris.zone=__NODEFAULT $(sparc_ONLY)file path=usr/lib/fm/llib-lldom $(sparc_ONLY)file path=usr/lib/fm/llib-lldom.ln $(sparc_ONLY)file path=usr/lib/fm/llib-lmdesc $(sparc_ONLY)file path=usr/lib/fm/llib-lmdesc.ln file path=usr/lib/fm/llib-lseslog file path=usr/lib/fm/llib-lseslog.ln -file path=usr/lib/fm/llib-ltopo -file path=usr/lib/fm/llib-ltopo.ln +file path=usr/lib/fm/llib-ltopo variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/fm/llib-ltopo.ln variant.opensolaris.zone=__NODEFAULT +# +# Topo xml maps are all global-zone only +# file path=usr/lib/fm/topo/maps/xfp-hc-topology.xml mode=0444 file path=usr/lib/fm/topo/plugins/disk.so mode=0555 file path=usr/lib/fm/topo/plugins/fac_prov_ipmi.so mode=0555 file path=usr/lib/fm/topo/plugins/ipmi.so mode=0555 file path=usr/lib/fm/topo/plugins/ses.so mode=0555 file path=usr/lib/fm/topo/plugins/xfp.so mode=0555 -$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/AMD.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/DISK.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/FMD.mo mode=0444 -$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/GMCA.mo mode=0444 -$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/INTEL.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/NXGE.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/PCI.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/PCIEX.mo mode=0444 -$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SCF.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.mo mode=0444 -$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4.mo mode=0444 -$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.mo mode=0444 -$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4V.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/SUNOS.mo mode=0444 -file path=usr/lib/locale/C/LC_MESSAGES/ZFS.mo mode=0444 +# +# Dictionaries, whether they are hardware-specific or not, are +# common to both global and non-global zones. +# +$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/AMD.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/DISK.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/FMD.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/FMNOTIFY.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/GMCA.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/INTEL.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/NXGE.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/PCI.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/PCIEX.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SCF.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/SMF.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4V.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/SUNOS.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +file path=usr/lib/locale/C/LC_MESSAGES/ZFS.mo mode=0444 \ + variant.opensolaris.zone=__NODEFAULT +# +# mdb support will automatically be included in both contexts; +# we allow eft.so to be included despite not delivering +# the eft plugin in non-global zones +# file path=usr/lib/mdb/proc/eft.so group=sys mode=0555 file path=usr/lib/mdb/proc/fmd.so group=sys mode=0555 +# +# Platform-specific fmd plugins are global zone only +# $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-CP3060/lib/fm/fmd/plugins/etm.conf $(sparc_ONLY)file \ @@ -607,46 +841,100 @@ $(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 -file path=usr/sbin/fmdump mode=0555 -file path=usr/sbin/fmstat mode=0555 -file path=usr/share/lib/xml/dtd/topology.dtd.1 -legacy pkg=SUNWfmd arch=$(ARCH) category=system \ - desc="Fault Management Daemon and Utilities" \ - hotline="Please contact your local service provider" \ - name="Fault Management Daemon and Utilities" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWfmdr arch=$(ARCH) category=system \ - desc="Fault Management Daemon and Utilities (Root)" \ - hotline="Please contact your local service provider" \ - name="Fault Management Daemon and Utilities (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +# +# Administrative utilities are common to both contexts +# +file path=usr/sbin/fmadm mode=0555 variant.opensolaris.zone=__NODEFAULT +file path=usr/sbin/fmdump mode=0555 variant.opensolaris.zone=__NODEFAULT +file path=usr/sbin/fmstat mode=0555 variant.opensolaris.zone=__NODEFAULT +# +# Topo DTD is also common +# +file path=usr/share/lib/xml/dtd/topology.dtd.1 \ + variant.opensolaris.zone=__NODEFAULT +# +# legacy packaging and license +# +legacy pkg=SUNWfmd desc="Fault Management Daemon and Utilities" \ + name="Fault Management Daemon and Utilities" +legacy pkg=SUNWfmdr desc="Fault Management Daemon and Utilities (Root)" \ + name="Fault Management Daemon and Utilities (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=usr/lib/fm/$(ARCH64)/libdiagcode.so target=./libdiagcode.so.1 -link path=usr/lib/fm/$(ARCH64)/libdiskstatus.so target=./libdiskstatus.so.1 -link path=usr/lib/fm/$(ARCH64)/libfmd_adm.so target=./libfmd_adm.so.1 -link path=usr/lib/fm/$(ARCH64)/libfmd_agent.so target=./libfmd_agent.so.1 -link path=usr/lib/fm/$(ARCH64)/libfmd_log.so target=./libfmd_log.so.1 -link path=usr/lib/fm/$(ARCH64)/libfmd_msg.so target=./libfmd_msg.so.1 -link path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so target=./libfmd_snmp.so.1 -link path=usr/lib/fm/$(ARCH64)/libfmevent.so target=./libfmevent.so.1 + +# +# libraries .so symlinks in lib +# +link path=lib/fm/$(ARCH64)/libfmevent.so target=./libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=lib/fm/libfmevent.so target=libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT + +# +# 64-bit .so symlinks +# +link path=usr/lib/fm/$(ARCH64)/libdiagcode.so target=./libdiagcode.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libdiskstatus.so target=./libdiskstatus.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmd_adm.so target=./libfmd_adm.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmd_agent.so target=./libfmd_agent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmd_log.so target=./libfmd_log.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmd_msg.so target=./libfmd_msg.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so target=./libfmd_snmp.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmevent.so \ + target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmevent.so.1 \ + target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/libfmnotify.so target=./libfmnotify.so.1 \ + variant.opensolaris.zone=__NODEFAULT $(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libldom.so target=libldom.so.1 $(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libmdesc.so target=libmdesc.so.1 link path=usr/lib/fm/$(ARCH64)/libseslog.so target=./libseslog.so.1 -link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 -link path=usr/lib/fm/libdiagcode.so target=libdiagcode.so.1 -link path=usr/lib/fm/libdiskstatus.so target=libdiskstatus.so.1 -link path=usr/lib/fm/libfmd_adm.so target=libfmd_adm.so.1 -link path=usr/lib/fm/libfmd_agent.so target=libfmd_agent.so.1 -link path=usr/lib/fm/libfmd_log.so target=libfmd_log.so.1 -link path=usr/lib/fm/libfmd_msg.so target=libfmd_msg.so.1 -link path=usr/lib/fm/libfmd_snmp.so target=libfmd_snmp.so.1 -link path=usr/lib/fm/libfmevent.so target=libfmevent.so.1 +link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/$(ARCH64)/llib-lfmevent.ln \ + target=../../../../lib/fm/$(ARCH64)/llib-lfmevent.ln +# +# 32-bit .so symlinks +# +link path=usr/lib/fm/libdiagcode.so target=libdiagcode.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libdiskstatus.so target=libdiskstatus.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmd_adm.so target=libfmd_adm.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmd_agent.so target=libfmd_agent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmd_log.so target=libfmd_log.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmd_msg.so target=libfmd_msg.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmd_snmp.so target=libfmd_snmp.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmevent.so target=../../../lib/fm/libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmevent.so.1 target=../../../lib/fm/libfmevent.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/libfmnotify.so target=libfmnotify.so.1 \ + variant.opensolaris.zone=__NODEFAULT $(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/libseslog.so target=libseslog.so.1 -link path=usr/lib/fm/libtopo.so target=libtopo.so.1 +link path=usr/lib/fm/libtopo.so target=libtopo.so.1 \ + variant.opensolaris.zone=__NODEFAULT +link path=usr/lib/fm/llib-lfmevent target=../../../lib/fm/llib-lfmevent +link path=usr/lib/fm/llib-lfmevent.ln target=../../../lib/fm/llib-lfmevent.ln +# +# symlinks for fmd plugins for particular platforms +# $(sparc_ONLY)link \ path=usr/platform/SUNW,Netra-CP3060/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 3cad270ffd..fe7deddc41 100644 --- a/usr/src/pkg/manifests/service-file-system-nfs.mf +++ b/usr/src/pkg/manifests/service-file-system-nfs.mf @@ -72,21 +72,13 @@ 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 -legacy pkg=SUNWnfsskr arch=$(ARCH) category=system \ +legacy pkg=SUNWnfsskr \ desc="Network File System (NFS) server kernel support (Root)" \ - hotline="Please contact your local service provider" \ - name="Network File System (NFS) server kernel support (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWnfssr arch=$(ARCH) category=system \ - desc="Network File System (NFS) server support (Root)" \ - hotline="Please contact your local service provider" \ - name="Network File System (NFS) server support (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWnfssu arch=$(ARCH) category=system \ - desc="Network File System (NFS) server support (Usr)" \ - hotline="Please contact your local service provider" \ - name="Network File System (NFS) server support (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Network File System (NFS) server kernel support (Root)" +legacy pkg=SUNWnfssr desc="Network File System (NFS) server support (Root)" \ + name="Network File System (NFS) server support (Root)" +legacy pkg=SUNWnfssu desc="Network File System (NFS) server support (Usr)" \ + name="Network File System (NFS) server support (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/reparse/$(ARCH64)/libnfs_basic.so target=./libnfs_basic.so.1 diff --git a/usr/src/pkg/manifests/service-file-system-smb.mf b/usr/src/pkg/manifests/service-file-system-smb.mf index d1a3a9b2dd..4a3a71f871 100644 --- a/usr/src/pkg/manifests/service-file-system-smb.mf +++ b/usr/src/pkg/manifests/service-file-system-smb.mf @@ -97,21 +97,12 @@ 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 -legacy pkg=SUNWsmbskr arch=$(ARCH) category=system \ - desc="SMB Server kernel root components" \ - hotline="Please contact your local service provider" \ - name="SMB Server (Kernel)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsmbsr arch=$(ARCH) category=system \ - desc="SMB Server root components" \ - hotline="Please contact your local service provider" \ - name="SMB Server (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsmbsu arch=$(ARCH) category=system \ - desc="SMB Server libraries and commands" \ - hotline="Please contact your local service provider" \ - name="SMB Server (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWsmbskr desc="SMB Server kernel root components" \ + name="SMB Server (Kernel)" +legacy pkg=SUNWsmbsr desc="SMB Server root components" \ + name="SMB Server (Root)" +legacy pkg=SUNWsmbsu desc="SMB Server libraries and commands" \ + name="SMB Server (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/reparse/libreparse_smb.so target=libreparse_smb.so.1 diff --git a/usr/src/pkg/manifests/service-hal.mf b/usr/src/pkg/manifests/service-hal.mf index 498e13a823..2345be7b64 100644 --- a/usr/src/pkg/manifests/service-hal.mf +++ b/usr/src/pkg/manifests/service-hal.mf @@ -165,19 +165,14 @@ 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 -legacy pkg=SUNWhal arch=$(ARCH) category=system \ - desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \ - hotline="Please contact your local service provider" \ - name="Hardware Abstraction Layer" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWhalr arch=$(ARCH) category=system \ +legacy pkg=SUNWhal desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \ + name="Hardware Abstraction Layer" +legacy pkg=SUNWhalr \ desc="Hardware Abstraction Layer, HAL (freedesktop.org) (Root)" \ - hotline="Please contact your local service provider" \ - name="Hardware Abstraction Layer (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/hal/LICENSE license=cmd/hal/LICENSE + name="Hardware Abstraction Layer (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE 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 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 e0dc89edda..82c1d6c9fd 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 @@ -56,20 +56,13 @@ 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 -legacy pkg=SUNWsckm.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWsckm.u arch=$(ARCH).sun4u \ desc="Key Management Modules for Sun Fire 15000" \ - hotline="Please contact your local service provider" \ - name="Key Management Modules for Sun Fire 15000" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWsckmr arch=$(ARCH) category=system \ - desc="SMF service for the Key Management daemon" \ - hotline="Please contact your local service provider" \ - name="SMF service for the Key Management daemon" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWsckmu.u arch=$(ARCH).sun4u category=system \ + name="Key Management Modules for Sun Fire 15000" +legacy pkg=SUNWsckmr desc="SMF service for the Key Management daemon" \ + name="SMF service for the Key Management daemon" +legacy pkg=SUNWsckmu.u arch=$(ARCH).sun4u \ desc="Key Management daemon for exchanging security keys from the Service Processor" \ - hotline="Please contact your local service provider" \ - name="Key Management daemon" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Key Management daemon" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 d341dd671b..2a384add46 100644 --- a/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf +++ b/usr/src/pkg/manifests/service-network-dhcp-datastore-binfiles.mf @@ -42,11 +42,9 @@ dir path=usr/sadm/admin dir path=usr/sadm/admin/dhcpmgr file path=usr/lib/inet/dhcp/svc/ds_SUNWbinfiles.so.1 file path=usr/sadm/admin/dhcpmgr/SUNWbinfiles.jar mode=0444 -legacy pkg=SUNWdhcsb arch=$(ARCH) category=system \ +legacy pkg=SUNWdhcsb \ desc="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." \ - hotline="Please contact your local service provider" \ - name="Binary File Format Data Module for BOOTP/DHCP Services" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Binary File Format Data Module for BOOTP/DHCP Services" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/inet/dhcp/svc/ds_SUNWbinfiles.so \ diff --git a/usr/src/pkg/manifests/service-network-dhcp.mf b/usr/src/pkg/manifests/service-network-dhcp.mf index 5b91686bf0..af2690b335 100644 --- a/usr/src/pkg/manifests/service-network-dhcp.mf +++ b/usr/src/pkg/manifests/service-network-dhcp.mf @@ -64,18 +64,16 @@ 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 -legacy pkg=SUNWdhcsr arch=$(ARCH) category=system \ +legacy pkg=SUNWdhcsr \ 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" \ - name="BOOTP/DHCP Server Services, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWdhcsu arch=$(ARCH) category=system \ + name="BOOTP/DHCP Server Services, (Root)" +legacy pkg=SUNWdhcsu \ desc="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." \ - hotline="Please contact your local service provider" \ - name="BOOTP/DHCP Server Services, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="BOOTP/DHCP Server Services, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.lib/in.dhcpd/THIRDPARTYLICENSE link path=usr/lib/inet/dhcp/svc/ds_SUNWfiles.so target=./ds_SUNWfiles.so.1 depend fmri=network/dhcp/dhcpmgr type=require depend fmri=network/ftp type=require diff --git a/usr/src/pkg/manifests/service-network-dns-mdns.mf b/usr/src/pkg/manifests/service-network-dns-mdns.mf index 56834774d6..48e3456377 100644 --- a/usr/src/pkg/manifests/service-network-dns-mdns.mf +++ b/usr/src/pkg/manifests/service-network-dns-mdns.mf @@ -134,22 +134,17 @@ file path=usr/share/lib/java/javadoc/dnssd/api/serialized-form.html \ 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 -legacy pkg=SUNWdsdr arch=$(ARCH) category=system \ +legacy pkg=SUNWdsdr \ desc="Root components for Multicast DNS daemon and service discovery support" \ - hotline="Please contact your local service provider" \ - name="Multicast DNS and Service Discovery (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWdsdu arch=$(ARCH) category=system \ - desc="Multicast DNS daemon and service discovery modules" \ - hotline="Please contact your local service provider" \ - name="Multicast DNS and Service Discovery (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE + name="Multicast DNS and Service Discovery (Root)" +legacy pkg=SUNWdsdu desc="Multicast DNS daemon and service discovery modules" \ + name="Multicast DNS and Service Discovery (Usr)" license cr_Sun license=cr_Sun -license lib/libdns_sd/THIRDPARTYLICENSE \ - license=lib/libdns_sd/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE +license usr/src/lib/libdns_sd/THIRDPARTYLICENSE \ + license=usr/src/lib/libdns_sd/THIRDPARTYLICENSE 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 link path=usr/lib/libdns_sd.so target=libdns_sd.so.1 diff --git a/usr/src/pkg/manifests/service-network-ftp.mf b/usr/src/pkg/manifests/service-network-ftp.mf index d8ee3fcfb5..9f923d28e5 100644 --- a/usr/src/pkg/manifests/service-network-ftp.mf +++ b/usr/src/pkg/manifests/service-network-ftp.mf @@ -57,16 +57,9 @@ file path=usr/sbin/ftpshut mode=0555 file path=usr/sbin/in.ftpd mode=0555 file path=usr/sbin/privatepw mode=0555 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" \ - hotline="Please contact your local service provider" \ - name="FTP Server, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license ../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \ - license=../../cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE +legacy pkg=SUNWftpr desc="FTP Server Configuration Files" \ + name="FTP Server, (Root)" +legacy pkg=SUNWftpu desc="FTP Server and Utilities" name="FTP Server, (Usr)" license cr_Sun license=cr_Sun +license usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE \ + license=usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/LICENSE diff --git a/usr/src/pkg/manifests/service-network-legacy.mf b/usr/src/pkg/manifests/service-network-legacy.mf index ad5417ca32..62f2219b79 100644 --- a/usr/src/pkg/manifests/service-network-legacy.mf +++ b/usr/src/pkg/manifests/service-network-legacy.mf @@ -48,15 +48,11 @@ 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 \ +legacy pkg=SUNWcnsr \ desc="Common Network Services (Root): time, daytime, echo, discard, chargen" \ - hotline="Please contact your local service provider" \ - name="Common Network Services (Root): time, daytime, echo, discard, chargen" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWcnsu arch=$(ARCH) category=system \ + name="Common Network Services (Root): time, daytime, echo, discard, chargen" +legacy pkg=SUNWcnsu \ desc="Common Network Services (Usr): time, daytime, echo, discard, chargen" \ - hotline="Please contact your local service provider" \ - name="Common Network Services (Usr): time, daytime, echo, discard, chargen" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Common Network Services (Usr): time, daytime, echo, discard, chargen" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 4710f57e43..cfde5082ca 100644 --- a/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf +++ b/usr/src/pkg/manifests/service-network-load-balancer-ilb.mf @@ -52,16 +52,12 @@ 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 -legacy pkg=SUNWilb arch=$(ARCH) category=system \ +legacy pkg=SUNWilb \ desc="Integrated IP layer 3/4 load balancer for Solaris (usr)" \ - hotline="Please contact your local service provider" \ - name="Integrated IP layer 3/4 load balancer for Solaris (usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWilbr arch=$(ARCH) category=system \ + name="Integrated IP layer 3/4 load balancer for Solaris (usr)" +legacy pkg=SUNWilbr \ desc="Integrated IP layer 3/4 load balancer for Solaris(root)" \ - hotline="Please contact your local service provider" \ - name="Integrated IP layer 3/4 load balancer for Solaris(root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Integrated IP layer 3/4 load balancer for Solaris(root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libilb.so target=./libilb.so.1 diff --git a/usr/src/pkg/manifests/service-network-network-clients.mf b/usr/src/pkg/manifests/service-network-network-clients.mf index c017d175c2..8ea99e6785 100644 --- a/usr/src/pkg/manifests/service-network-network-clients.mf +++ b/usr/src/pkg/manifests/service-network-network-clients.mf @@ -47,20 +47,18 @@ file path=usr/sbin/rmt mode=0555 file path=usr/sbin/rwall mode=0555 file path=usr/sbin/snoop mode=0555 file path=usr/sbin/spray mode=0555 -legacy pkg=SUNWrcmdc arch=$(ARCH) category=system \ +legacy pkg=SUNWrcmdc \ desc="Remote Network Client Commands (rsh, rlogin, rcp, rsh, ...)" \ - hotline="Please contact your local service provider" \ - name="Remote Network Client Commands" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/cmd-inet/THIRDPARTYLICENSE.kcmd \ - license=cmd/cmd-inet/THIRDPARTYLICENSE.kcmd -license cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp \ - license=cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp -license cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh \ - license=cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh -license cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE + name="Remote Network Client Commands" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/THIRDPARTYLICENSE.kcmd \ + license=usr/src/cmd/cmd-inet/THIRDPARTYLICENSE.kcmd +license usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp \ + license=usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rcp +license usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh \ + license=usr/src/cmd/cmd-inet/usr.bin/THIRDPARTYLICENSE.rsh +license usr/src/cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.bin/rdist/THIRDPARTYLICENSE link path=usr/bin/remsh target=./rsh link path=usr/lib/sunw,rcp target=../bin/rcp diff --git a/usr/src/pkg/manifests/service-network-network-servers.mf b/usr/src/pkg/manifests/service-network-network-servers.mf index 78bc884839..e8b9145f19 100644 --- a/usr/src/pkg/manifests/service-network-network-servers.mf +++ b/usr/src/pkg/manifests/service-network-network-servers.mf @@ -68,20 +68,15 @@ 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 -legacy pkg=SUNWrcmdr arch=$(ARCH) category=system \ - desc="Remote Network Server Commands (Root)" \ - hotline="Please contact your local service provider" \ - name="Remote Network Server Commands (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWrcmds arch=$(ARCH) category=system \ +legacy pkg=SUNWrcmdr desc="Remote Network Server Commands (Root)" \ + name="Remote Network Server Commands (Root)" +legacy pkg=SUNWrcmds \ 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 -license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat \ - license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat -license cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind \ - license=cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind + name="Remote Network Server Commands (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat \ + license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.comsat +license usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind \ + license=usr/src/cmd/cmd-inet/usr.sbin/THIRDPARTYLICENSE.rlogind link path=etc/rmt target=../usr/sbin/rmt diff --git a/usr/src/pkg/manifests/service-network-nis.mf b/usr/src/pkg/manifests/service-network-nis.mf index 470ddbf323..f2f22d9e98 100644 --- a/usr/src/pkg/manifests/service-network-nis.mf +++ b/usr/src/pkg/manifests/service-network-nis.mf @@ -71,15 +71,9 @@ file path=usr/sbin/revnetgroup mode=0555 file path=var/yp/Makefile mode=0555 original_name=SUNWyp:var/yp/Makefile \ preserve=renamenew file path=var/yp/updaters mode=0500 -legacy pkg=SUNWypr arch=$(ARCH) category=system \ - desc="NIS Server for Solaris 2.6 and up" \ - hotline="Please contact your local service provider" \ - name="NIS Server for Solaris (root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWypu arch=$(ARCH) category=system \ - desc="NIS Server for Solaris 2.6 and up" \ - hotline="Please contact your local service provider" \ - name="NIS Server for Solaris (usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWypr desc="NIS Server for Solaris 2.6 and up" \ + name="NIS Server for Solaris (root)" +legacy pkg=SUNWypu desc="NIS Server for Solaris 2.6 and up" \ + name="NIS Server for Solaris (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-network-slp.mf b/usr/src/pkg/manifests/service-network-slp.mf index 596ee766e8..9af88f38fb 100644 --- a/usr/src/pkg/manifests/service-network-slp.mf +++ b/usr/src/pkg/manifests/service-network-slp.mf @@ -59,14 +59,12 @@ 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 -legacy pkg=SUNWslpr arch=$(ARCH) category=system \ +legacy pkg=SUNWslpr \ 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)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWslpu arch=$(ARCH) category=system \ + name="SLP, (Root)" +legacy pkg=SUNWslpu \ desc="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)." \ - hotline="Please contact your local service provider" name="SLP, (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="SLP, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libslp.so target=libslp.so.1 diff --git a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf index 099af80d17..ee0693459f 100644 --- a/usr/src/pkg/manifests/service-network-smtp-sendmail.mf +++ b/usr/src/pkg/manifests/service-network-smtp-sendmail.mf @@ -183,18 +183,13 @@ 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 -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 -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 -license cmd/sendmail/THIRDPARTYLICENSE license=cmd/sendmail/THIRDPARTYLICENSE +legacy pkg=SUNWsndmr desc="Sendmail Configuration Files" \ + name="Sendmail (root)" +legacy pkg=SUNWsndmu desc="Sendmail Utilities" name="Sendmail (/usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/sendmail/THIRDPARTYLICENSE \ + license=usr/src/cmd/sendmail/THIRDPARTYLICENSE link path=etc/aliases target=./mail/aliases link path=etc/mail/cf/cf/main.cf target=sendmail.cf link path=etc/mail/cf/cf/main.mc target=sendmail.mc diff --git a/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf b/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf index d688a83326..562161be2d 100644 --- a/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf +++ b/usr/src/pkg/manifests/service-network-snmp-mibiisa.mf @@ -33,10 +33,7 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/snmp group=sys file path=usr/lib/snmp/mibiisa group=sys mode=0755 -legacy pkg=SUNWmibii arch=$(ARCH) category=system \ - desc="Solstice Enterprise Agents 1.0.3 snmp daemon" \ - hotline="Please contact your local service provider" \ - name="Solstice Enterprise Agents 1.0.3 SNMP daemon" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWmibii desc="Solstice Enterprise Agents 1.0.3 snmp daemon" \ + name="Solstice Enterprise Agents 1.0.3 SNMP daemon" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-network-ssh.mf b/usr/src/pkg/manifests/service-network-ssh.mf index a67ad8e2b4..66b053c0c2 100644 --- a/usr/src/pkg/manifests/service-network-ssh.mf +++ b/usr/src/pkg/manifests/service-network-ssh.mf @@ -45,15 +45,10 @@ 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 -legacy pkg=SUNWsshdr arch=$(ARCH) category=system \ - desc="Secure Shell protocol Server" \ - hotline="Please contact your local service provider" \ - name="SSH Server, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsshdu arch=$(ARCH) category=system \ - desc="Secure Shell protocol Server" \ - hotline="Please contact your local service provider" \ - name="SSH Server, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/ssh/THIRDPARTYLICENSE license=cmd/ssh/THIRDPARTYLICENSE +legacy pkg=SUNWsshdr desc="Secure Shell protocol Server" \ + name="SSH Server, (Root)" +legacy pkg=SUNWsshdu desc="Secure Shell protocol Server" \ + name="SSH Server, (Usr)" +license usr/src/cmd/ssh/THIRDPARTYLICENSE \ + license=usr/src/cmd/ssh/THIRDPARTYLICENSE depend fmri=text/locale type=require diff --git a/usr/src/pkg/manifests/service-network-telnet.mf b/usr/src/pkg/manifests/service-network-telnet.mf index 0900558677..7079634599 100644 --- a/usr/src/pkg/manifests/service-network-telnet.mf +++ b/usr/src/pkg/manifests/service-network-telnet.mf @@ -41,15 +41,9 @@ file path=etc/default/telnetd group=sys \ original_name=SUNWtnetd:etc/default/telnetd preserve=true 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" \ - name="Telnet Server Daemon (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWtnetr arch=$(ARCH) category=system \ - desc="Telnet Server Daemon (Root)" \ - hotline="Please contact your local service provider" \ - name="Telnet Server Daemon (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWtnetd desc="Telnet Server Daemon (Usr)" \ + name="Telnet Server Daemon (Usr)" +legacy pkg=SUNWtnetr desc="Telnet Server Daemon (Root)" \ + name="Telnet Server Daemon (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-network-tftp.mf b/usr/src/pkg/manifests/service-network-tftp.mf index 1ea4e95c01..869e218818 100644 --- a/usr/src/pkg/manifests/service-network-tftp.mf +++ b/usr/src/pkg/manifests/service-network-tftp.mf @@ -34,15 +34,9 @@ dir path=usr/bin dir path=usr/sbin file path=usr/bin/tftp mode=0555 file path=usr/sbin/in.tftpd mode=0555 -legacy pkg=SUNWtftp arch=$(ARCH) category=system \ - desc="Trivial File Transfer Server" \ - hotline="Please contact your local service provider" \ - name="Trivial File Transfer Server" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -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 +legacy pkg=SUNWtftp desc="Trivial File Transfer Server" \ + name="Trivial File Transfer Server" +legacy pkg=SUNWtftpr desc="Trivial File Transfer Server (Root)" \ + name="Trivial File Transfer Server (Root)" 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 dae10971d0..de8dcbf04c 100644 --- a/usr/src/pkg/manifests/service-network-uucp.mf +++ b/usr/src/pkg/manifests/service-network-uucp.mf @@ -109,19 +109,14 @@ 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 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" \ - hotline="Please contact your local service provider" \ - name="Networking UUCP Utilities, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWbnuu arch=$(ARCH) category=system \ - desc="UUCP utilities and daemon" \ - hotline="Please contact your local service provider" \ - name="Networking UUCP Utilities, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/bnu/THIRDPARTYLICENSE license=cmd/bnu/THIRDPARTYLICENSE +legacy pkg=SUNWbnur desc="configuration and start-up files for UUCP utilities" \ + name="Networking UUCP Utilities, (Root)" +legacy pkg=SUNWbnuu desc="UUCP utilities and daemon" \ + name="Networking UUCP Utilities, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/bnu/THIRDPARTYLICENSE \ + license=usr/src/cmd/bnu/THIRDPARTYLICENSE link path=etc/uucp/remote.unknown target=../../usr/lib/uucp/remote.unknown link path=var/spool/uucp/.Admin target=../../uucp/.Admin link path=var/spool/uucp/.Log target=../../uucp/.Log diff --git a/usr/src/pkg/manifests/service-network-wpa.mf b/usr/src/pkg/manifests/service-network-wpa.mf index 1cc0f3cd2e..a612450788 100644 --- a/usr/src/pkg/manifests/service-network-wpa.mf +++ b/usr/src/pkg/manifests/service-network-wpa.mf @@ -39,17 +39,13 @@ 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 \ +legacy pkg=SUNWwpar \ desc="The service implements the IEEE802.11i (WPA/WPA2) specification." \ - hotline="Please contact your local service provider" \ - name="Wireless WPA Supplicant, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWwpau arch=$(ARCH) category=system \ + name="Wireless WPA Supplicant, (Root)" +legacy pkg=SUNWwpau \ desc="The service implements the IEEE802.11i (WPA/WPA2) specification." \ - hotline="Please contact your local service provider" \ - name="Wireless WPA Supplicant, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE + name="Wireless WPA Supplicant, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.lib/wpad/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf index c7c3164f4b..e638b827b8 100644 --- a/usr/src/pkg/manifests/service-picl.mf +++ b/usr/src/pkg/manifests/service-picl.mf @@ -647,16 +647,11 @@ $(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 -legacy pkg=SUNWpiclr arch=$(ARCH) category=system \ - desc="PICL Framework init scripts" \ - hotline="Please contact your local service provider" \ - name="PICL Framework (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWpiclu arch=$(ARCH) category=system \ +legacy pkg=SUNWpiclr desc="PICL Framework init scripts" \ + name="PICL Framework (Root)" +legacy pkg=SUNWpiclu \ desc="PICL Daemon, Libraries, prtpicl client and plug-in modules" \ - hotline="Please contact your local service provider" \ - name="PICL Libraries, and Plugin Modules (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="PICL Libraries, and Plugin Modules (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libpicl.so target=./libpicl.so.1 diff --git a/usr/src/pkg/manifests/service-resource-cap.mf b/usr/src/pkg/manifests/service-resource-cap.mf index 1ed29417a2..61116b98ef 100644 --- a/usr/src/pkg/manifests/service-resource-cap.mf +++ b/usr/src/pkg/manifests/service-resource-cap.mf @@ -45,15 +45,9 @@ 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 hardlink path=usr/lib/rcap/rcapd target=../isaexec -legacy pkg=SUNWrcapr arch=$(ARCH) category=system \ - desc="Solaris Resource Capping Daemon (Root)" \ - hotline="Please contact your local service provider" \ - name="Solaris Resource Capping Daemon (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWrcapu arch=$(ARCH) category=system \ - desc="Solaris Resource Capping Daemon (Usr)" \ - hotline="Please contact your local service provider" \ - name="Solaris Resource Capping Daemon (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWrcapr desc="Solaris Resource Capping Daemon (Root)" \ + name="Solaris Resource Capping Daemon (Root)" +legacy pkg=SUNWrcapu desc="Solaris Resource Capping Daemon (Usr)" \ + name="Solaris Resource Capping Daemon (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/service-resource-pools-poold.mf b/usr/src/pkg/manifests/service-resource-pools-poold.mf index 187e4564c9..e19d9f07ff 100644 --- a/usr/src/pkg/manifests/service-resource-pools-poold.mf +++ b/usr/src/pkg/manifests/service-resource-pools-poold.mf @@ -38,11 +38,8 @@ file path=usr/lib/pool/libjpool.so.1 file path=usr/lib/pool/libjsyslog.so.1 file path=usr/lib/pool/poold mode=0555 file path=usr/lib/pool/poold.properties mode=0444 -legacy pkg=SUNWpoold arch=$(ARCH) category=system \ - desc="core software for dynamic resource pools" \ - hotline="Please contact your local service provider" \ - name="Dynamic Resource Pools" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpoold desc="core software for dynamic resource pools" \ + name="Dynamic Resource Pools" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/pool/libjkstat.so target=./libjkstat.so.1 diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.mf index 6e0c8a82b2..35c97d18cf 100644 --- a/usr/src/pkg/manifests/service-resource-pools.mf +++ b/usr/src/pkg/manifests/service-resource-pools.mf @@ -73,16 +73,10 @@ 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 -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 -legacy pkg=SUNWpoolr arch=$(ARCH) category=system \ - desc="core software for resource pools (Root)" \ - hotline="Please contact your local service provider" \ - name="Resource Pools (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpool desc="core software for resource pools" \ + name="Resource Pools" +legacy pkg=SUNWpoolr desc="core software for resource pools (Root)" \ + name="Resource Pools (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libpool.so target=libpool.so.1 diff --git a/usr/src/pkg/manifests/service-security-gss.mf b/usr/src/pkg/manifests/service-security-gss.mf index a4254355c1..e679c59de2 100644 --- a/usr/src/pkg/manifests/service-security-gss.mf +++ b/usr/src/pkg/manifests/service-security-gss.mf @@ -44,11 +44,9 @@ file path=etc/gss/mech group=sys original_name=SUNWgssc:etc/gss/mech \ 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 \ +legacy pkg=SUNWgssc \ desc="Generic Security Service Application Program Interface, Version 2 - config" \ - hotline="Please contact your local service provider" \ - name="GSSAPI CONFIG V2" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="GSSAPI CONFIG V2" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL # diff --git a/usr/src/pkg/manifests/service-security-kerberos-5.mf b/usr/src/pkg/manifests/service-security-kerberos-5.mf index ed41e7221a..c7ba7ddd17 100644 --- a/usr/src/pkg/manifests/service-security-kerberos-5.mf +++ b/usr/src/pkg/manifests/service-security-kerberos-5.mf @@ -78,20 +78,14 @@ 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 -legacy pkg=SUNWkrbr arch=$(ARCH) category=system \ - desc="Kerberos version 5 support (Root)" \ - hotline="Please contact your local service provider" \ - name="Kerberos version 5 support (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWkrbu arch=$(ARCH) category=system \ - desc="Kerberos version 5 support (Usr)" \ - hotline="Please contact your local service provider" \ - name="Kerberos version 5 support (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWkrbr desc="Kerberos version 5 support (Root)" \ + name="Kerberos version 5 support (Root)" +legacy pkg=SUNWkrbu desc="Kerberos version 5 support (Usr)" \ + name="Kerberos version 5 support (Usr)" license cr_Sun license=cr_Sun -license lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE \ - license=lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE \ + license=usr/src/lib/gss_mechs/mech_krb5/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/gss/mech_krb5.so target=./mech_krb5.so.1 link path=usr/lib/$(ARCH64)/libkrb5.so target=./libkrb5.so.1 link path=usr/lib/gss/mech_krb5.so target=./mech_krb5.so.1 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 6b46cf5e72..f1ee61eb8e 100644 --- a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf +++ b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf @@ -122,15 +122,11 @@ hardlink path=usr/sbin/dscfgadm target=../bin/dscfgadm hardlink path=usr/sbin/dsstat target=../bin/dsstat hardlink path=usr/sbin/nscadm target=../bin/nscadm hardlink path=usr/sbin/scmadm target=../bin/scmadm -legacy pkg=SUNWscmr arch=$(ARCH) category=system \ +legacy pkg=SUNWscmr \ desc="Storage Cache Management of read-only bitmap volumes" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Cache Management (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWscmu arch=$(ARCH) category=system \ + name="Sun StorageTek Availability Suite Cache Management (root)" +legacy pkg=SUNWscmu \ desc="Storage Cache Management of read-only bitmap volumes" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Cache Management (usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun StorageTek Availability Suite Cache Management (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 eceff9b37a..baed77c936 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 @@ -46,16 +46,11 @@ file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \ 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 -legacy pkg=SUNWcfpl arch=$(ARCH) category=system \ - desc="Provides the fp plug-in library of libcfgadm." \ - hotline="Please contact your local service provider" \ - name="fp cfgadm plug-in library" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWcfplr arch=$(ARCH) category=system \ +legacy pkg=SUNWcfpl desc="Provides the fp plug-in library of libcfgadm." \ + name="fp cfgadm plug-in library" +legacy pkg=SUNWcfplr \ desc="Provides support for fp plug-in library of libcfgadm." \ - hotline="Please contact your local service provider" \ - name="fp cfgadm plug-in library (root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="fp cfgadm plug-in library (root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/cfgadm/$(ARCH64)/fp.so target=fp.so.1 diff --git a/usr/src/pkg/manifests/service-storage-isns.mf b/usr/src/pkg/manifests/service-storage-isns.mf index d199da2c69..306f2247a7 100644 --- a/usr/src/pkg/manifests/service-storage-isns.mf +++ b/usr/src/pkg/manifests/service-storage-isns.mf @@ -39,20 +39,11 @@ 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 -legacy pkg=SUNWisns arch=$(ARCH) category=system \ - desc="Solaris internet Storage Name Service(iSNS) Server" \ - hotline="Please contact your local service provider" \ - name="Solaris iSNS Server" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWisnsadm arch=$(ARCH) category=system \ - desc="Solaris iSNS Server Administration Utility" \ - hotline="Please contact your local service provider" \ - name="Solaris iSNS Server CLI" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWisnsr arch=$(ARCH) category=system \ - desc="Solaris internet Storage Name Service(iSNS) Server" \ - hotline="Please contact your local service provider" \ - name="Solaris iSNS Server (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWisns desc="Solaris internet Storage Name Service(iSNS) Server" \ + name="Solaris iSNS Server" +legacy pkg=SUNWisnsadm desc="Solaris iSNS Server Administration Utility" \ + name="Solaris iSNS Server CLI" +legacy pkg=SUNWisnsr desc="Solaris internet Storage Name Service(iSNS) Server" \ + name="Solaris iSNS Server (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 2027cf5cd1..b3607f6292 100644 --- a/usr/src/pkg/manifests/service-storage-media-volume-manager.mf +++ b/usr/src/pkg/manifests/service-storage-media-volume-manager.mf @@ -48,16 +48,10 @@ 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 -legacy pkg=SUNWrmvolmgr arch=$(ARCH) category=system \ - desc="Non-graphical removable volume manager" \ - hotline="Please contact your local service provider" \ - name="Removable volume manager" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWrmvolmgrr arch=$(ARCH) category=system \ - desc="Non-graphical removable volume manager (Root)" \ - hotline="Please contact your local service provider" \ - name="Removable volume manager (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWrmvolmgr desc="Non-graphical removable volume manager" \ + name="Removable volume manager" +legacy pkg=SUNWrmvolmgrr desc="Non-graphical removable volume manager (Root)" \ + name="Removable volume manager (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/bin/rmumount target=./rmmount diff --git a/usr/src/pkg/manifests/service-storage-ndmp.mf b/usr/src/pkg/manifests/service-storage-ndmp.mf index e8a768cc81..3b09715850 100644 --- a/usr/src/pkg/manifests/service-storage-ndmp.mf +++ b/usr/src/pkg/manifests/service-storage-ndmp.mf @@ -58,19 +58,15 @@ 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 -legacy pkg=SUNWndmpr arch=$(ARCH) category=system \ +legacy pkg=SUNWndmpr \ desc="Network Data Management Protocol Service (root components)" \ - hotline="Please contact your local service provider" \ - name="Network Data Management Protocol Service (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWndmpu arch=$(ARCH) category=system \ + name="Network Data Management Protocol Service (Root)" +legacy pkg=SUNWndmpu \ desc="Network Data Management Protocol Service (user components)" \ - hotline="Please contact your local service provider" \ - name="Network Data Management Protocol Service (User)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/ndmpd/LICENSE license=cmd/ndmpd/LICENSE + name="Network Data Management Protocol Service (User)" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble +license usr/src/cmd/ndmpd/LICENSE license=usr/src/cmd/ndmpd/LICENSE link path=usr/lib/$(ARCH64)/libndmp.so target=libndmp.so.1 link path=usr/lib/libndmp.so target=libndmp.so.1 diff --git a/usr/src/pkg/manifests/service-storage-removable-media.mf b/usr/src/pkg/manifests/service-storage-removable-media.mf index 67f02d4590..33dba7059b 100644 --- a/usr/src/pkg/manifests/service-storage-removable-media.mf +++ b/usr/src/pkg/manifests/service-storage-removable-media.mf @@ -54,16 +54,10 @@ 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 -legacy pkg=SUNWsmedia arch=$(ARCH) category=system \ - desc="Storage media management library" \ - hotline="Please contact your local service provider" \ - name="Storage media management library" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsmediar arch=$(ARCH) category=system \ - desc="Storage media management library (Root)" \ - hotline="Please contact your local service provider" \ - name="Storage media management library (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWsmedia desc="Storage media management library" \ + name="Storage media management library" +legacy pkg=SUNWsmediar desc="Storage media management library (Root)" \ + name="Storage media management library (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libsmedia.so target=./libsmedia.so.1 diff --git a/usr/src/pkg/manifests/service-storage-virus-scan.mf b/usr/src/pkg/manifests/service-storage-virus-scan.mf index 484f1cff76..ed009daebf 100644 --- a/usr/src/pkg/manifests/service-storage-virus-scan.mf +++ b/usr/src/pkg/manifests/service-storage-virus-scan.mf @@ -52,21 +52,12 @@ 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 -legacy pkg=SUNWvscankr arch=$(ARCH) category=system \ - desc="Virus Scan Service Kernel Root Components" \ - hotline="Please contact your local service provider" \ - name="Virus Scan Service Kernel (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWvscanr arch=$(ARCH) category=system \ - desc="Virus Scan Service Root Components" \ - hotline="Please contact your local service provider" \ - name="Virus Scan Service (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWvscanu arch=$(ARCH) category=system \ - desc="Virus Scan Service Usr Components" \ - hotline="Please contact your local service provider" \ - name="Virus Scan Service (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWvscankr desc="Virus Scan Service Kernel Root Components" \ + name="Virus Scan Service Kernel (Root)" +legacy pkg=SUNWvscanr desc="Virus Scan Service Root Components" \ + name="Virus Scan Service (Root)" +legacy pkg=SUNWvscanu desc="Virus Scan Service Usr Components" \ + name="Virus Scan Service (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/vscan/libvscan.so target=libvscan.so.1 diff --git a/usr/src/pkg/manifests/source-demo-mdb-examples.mf b/usr/src/pkg/manifests/source-demo-mdb-examples.mf index 93b1cf45ad..fcbc790492 100644 --- a/usr/src/pkg/manifests/source-demo-mdb-examples.mf +++ b/usr/src/pkg/manifests/source-demo-mdb-examples.mf @@ -47,10 +47,8 @@ file path=usr/demo/mdb/Makefile.sparcv9 file path=usr/demo/mdb/README file path=usr/demo/mdb/common/example1.c file path=usr/demo/mdb/common/example2.c -legacy pkg=SUNWmdbdm arch=$(ARCH) category=system \ +legacy pkg=SUNWmdbdm \ desc="Modular Debugger (MDB) demonstration modules and source code" \ - hotline="Please contact your local service provider" \ - name="Modular Debugger Demo Source" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Modular Debugger Demo Source" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/source-demo-system.mf b/usr/src/pkg/manifests/source-demo-system.mf index 5d171a8759..70c783c070 100644 --- a/usr/src/pkg/manifests/source-demo-system.mf +++ b/usr/src/pkg/manifests/source-demo-system.mf @@ -48,8 +48,8 @@ dir path=usr/demo/librtld_db/tests dir path=usr/demo/link_audit dir path=usr/demo/link_audit/man dir path=usr/demo/link_audit/src +file path=usr/demo/ELF/00README file path=usr/demo/ELF/Makefile -file path=usr/demo/ELF/README file path=usr/demo/ELF/acom.c file path=usr/demo/ELF/dcom.c file path=usr/demo/ELF/dispsyms.c @@ -280,11 +280,10 @@ file path=usr/demo/link_audit/src/truss.c file path=usr/demo/link_audit/src/who.c 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 \ +legacy pkg=SUNWosdem \ 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 + name="OS demo source" license cr_Sun license=cr_Sun -license lib/libshell/THIRDPARTYLICENSE license=lib/libshell/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/libshell/THIRDPARTYLICENSE \ + license=usr/src/lib/libshell/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/source-network-pppdump.mf b/usr/src/pkg/manifests/source-network-pppdump.mf index cca230c60a..658e2aca67 100644 --- a/usr/src/pkg/manifests/source-network-pppdump.mf +++ b/usr/src/pkg/manifests/source-network-pppdump.mf @@ -54,15 +54,13 @@ file path=usr/share/src/ppputil/pppdump/pppdump.1m file path=usr/share/src/ppputil/pppdump/pppdump.c file path=usr/share/src/ppputil/pppdump/zlib.c file path=usr/share/src/ppputil/pppdump/zlib.h -legacy pkg=SUNWpppgS arch=$(ARCH) category=system \ +legacy pkg=SUNWpppgS \ 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 -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 \ - license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd -license cmd/cmd-inet/usr.bin/pppdump/LICENSE.top \ - license=cmd/cmd-inet/usr.bin/pppdump/LICENSE.top + name="Source for the GNU utilities for PPP" license cr_Sun license=cr_Sun +license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \ + license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect +license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \ + license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd +license usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf index 7819d3a46b..4ecc4aea82 100644 --- a/usr/src/pkg/manifests/source-security-tcp-wrapper.mf +++ b/usr/src/pkg/manifests/source-security-tcp-wrapper.mf @@ -107,9 +107,8 @@ file path=usr/share/src/tcp_wrappers/update.c file path=usr/share/src/tcp_wrappers/update.c.org file path=usr/share/src/tcp_wrappers/vfprintf.c file path=usr/share/src/tcp_wrappers/workarounds.c -legacy pkg=SUNWtcpdS arch=$(ARCH) category=system \ +legacy pkg=SUNWtcpdS \ desc="tcpd - access control facility for internet services (Source)" \ - hotline="Please contact your local service provider" \ - name="tcpd - access control facility for internet services (Source)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/tcpd/THIRDPARTYLICENSE license=cmd/tcpd/THIRDPARTYLICENSE + name="tcpd - access control facility for internet services (Source)" +license usr/src/cmd/tcpd/THIRDPARTYLICENSE \ + license=usr/src/cmd/tcpd/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/source-system-grub.mf b/usr/src/pkg/manifests/source-system-grub.mf index 5f961a0ff0..45d3e506b7 100644 --- a/usr/src/pkg/manifests/source-system-grub.mf +++ b/usr/src/pkg/manifests/source-system-grub.mf @@ -289,10 +289,8 @@ file path=usr/share/src/grub/util/grub-set-default.in file path=usr/share/src/grub/util/grub-terminfo.in file path=usr/share/src/grub/util/mbchk.c file path=usr/share/src/grub/util/mkbimage -legacy pkg=SUNWgrubS arch=$(ARCH) category=system desc="Source for GNU GRUB" \ - hotline="Please contact your local service provider" \ - name="Source for GNU GRUB - GNU GRand Unified Bootloader" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWgrubS desc="Source for GNU GRUB" \ + name="Source for GNU GRUB - GNU GRand Unified Bootloader" license cr_Sun license=cr_Sun -license grubcredits license=grubcredits -license lic_GPLv2 license=lic_GPLv2 +license usr/src/grub/grub-0.97/AUTHORS license=usr/src/grub/grub-0.97/AUTHORS +license usr/src/grub/grub-0.97/COPYING license=usr/src/grub/grub-0.97/COPYING 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 325889e3ab..8a0cab9a9b 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 @@ -81,16 +81,10 @@ file path=usr/kernel/drv/ii.conf group=sys \ 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 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" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Point-In-Time Copy (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWiiu arch=$(ARCH) category=system \ - desc="Point-In-Time Copy and snapshot facility" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Point-In-Time Copy (usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWiir desc="Point-In-Time Copy and snapshot facility" \ + name="Sun StorageTek Availability Suite Point-In-Time Copy (root)" +legacy pkg=SUNWiiu desc="Point-In-Time Copy and snapshot facility" \ + name="Sun StorageTek Availability Suite Point-In-Time Copy (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/cluster/lib/dscfg/start/05ii target=../../../sbin/ii diff --git a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf index a84618bd70..112545d3b2 100644 --- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf +++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf @@ -101,16 +101,12 @@ hardlink path=usr/lib/sndrd target=../bin/sndrd hardlink path=usr/lib/sndrsyncd target=../bin/sndrsyncd hardlink path=usr/sbin/sndradm target=../bin/sndradm hardlink path=usr/sbin/sndrboot target=../bin/sndrboot -legacy pkg=SUNWrdcr arch=$(ARCH) category=system \ +legacy pkg=SUNWrdcr \ desc="Remote Mirror copy software provides replication across IP networks" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Remote Mirror (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWrdcu arch=$(ARCH) category=system \ + name="Sun StorageTek Availability Suite Remote Mirror (root)" +legacy pkg=SUNWrdcu \ desc="Remote Mirror copy software provides replication across IP networks" \ - hotline="Please contact your local service provider" \ - name="Sun StorageTek Availability Suite Remote Mirror (usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun StorageTek Availability Suite Remote Mirror (usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/cluster/lib/dscfg/start/10rdc target=../../../sbin/rdc diff --git a/usr/src/pkg/manifests/storage-library-network-array.mf b/usr/src/pkg/manifests/storage-library-network-array.mf index 039955ef92..b0122d7d25 100644 --- a/usr/src/pkg/manifests/storage-library-network-array.mf +++ b/usr/src/pkg/manifests/storage-library-network-array.mf @@ -41,11 +41,8 @@ file path=lib/$(ARCH64)/liba5k.so.2 file path=lib/$(ARCH64)/libg_fc.so.2 file path=lib/liba5k.so.2 file path=lib/libg_fc.so.2 -legacy pkg=SUNWluxopr arch=$(ARCH) category=system \ - desc="Sun Enterprise Network Array libraries" \ - hotline="Please contact your local service provider" \ - name="Sun Enterprise Network Array libraries" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWluxopr desc="Sun Enterprise Network Array libraries" \ + name="Sun Enterprise Network Array libraries" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=lib/$(ARCH64)/liba5k.so target=liba5k.so.2 diff --git a/usr/src/pkg/manifests/storage-metassist.mf b/usr/src/pkg/manifests/storage-metassist.mf index d489946fda..1beb3688b3 100644 --- a/usr/src/pkg/manifests/storage-metassist.mf +++ b/usr/src/pkg/manifests/storage-metassist.mf @@ -49,15 +49,9 @@ file path=usr/share/lib/xml/dtd/volume-config.dtd group=sys file path=usr/share/lib/xml/dtd/volume-defaults.dtd group=sys file path=usr/share/lib/xml/dtd/volume-request.dtd group=sys file path=usr/share/lib/xml/style/volume-command.xsl group=sys -legacy pkg=SUNWmdar arch=$(ARCH) category=system \ - desc="Solaris Volume Manager Assistant (Root)" \ - hotline="Please contact your local service provider" \ - name="Solaris Volume Manager Assistant (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWmdau arch=$(ARCH) category=system \ - desc="Solaris Volume Manager Assistant (Usr)" \ - hotline="Please contact your local service provider" \ - name="Solaris Volume Manager Assistant (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWmdar desc="Solaris Volume Manager Assistant (Root)" \ + name="Solaris Volume Manager Assistant (Root)" +legacy pkg=SUNWmdau desc="Solaris Volume Manager Assistant (Usr)" \ + name="Solaris Volume Manager Assistant (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/storage-mpathadm.mf b/usr/src/pkg/manifests/storage-mpathadm.mf index 972cc27863..296c24e302 100644 --- a/usr/src/pkg/manifests/storage-mpathadm.mf +++ b/usr/src/pkg/manifests/storage-mpathadm.mf @@ -39,10 +39,8 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/sbin file path=usr/sbin/mpathadm mode=0555 -legacy pkg=SUNWmpathadm arch=$(ARCH) category=system \ +legacy pkg=SUNWmpathadm \ desc="Path Administration Utility for a Solaris Multipathing device" \ - hotline="Please contact your local service provider" \ - name="Solaris Multipathing CLI" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Solaris Multipathing CLI" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.mf index d44f0d0aa6..abcef6ceb1 100644 --- a/usr/src/pkg/manifests/storage-stmf.mf +++ b/usr/src/pkg/manifests/storage-stmf.mf @@ -105,16 +105,11 @@ $(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 -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 -legacy pkg=SUNWstmfu arch=$(ARCH) category=system \ +legacy pkg=SUNWstmf desc="Sun Common Multiprotocol SCSI Target device drivers" \ + name="Sun Common Multiprotocol SCSI Target" +legacy pkg=SUNWstmfu \ desc="Sun Common Multiprotocol SCSI Target Libraries and Tools" \ - hotline="Please contact your local service provider" \ - name="Sun Common Multiprotocol SCSI Target Libraries and Tools" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun Common Multiprotocol SCSI Target Libraries and Tools" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libstmf.so target=libstmf.so.1 diff --git a/usr/src/pkg/manifests/storage-svm.mf b/usr/src/pkg/manifests/storage-svm.mf index bc7a4915ed..bbd3da49e5 100644 --- a/usr/src/pkg/manifests/storage-svm.mf +++ b/usr/src/pkg/manifests/storage-svm.mf @@ -135,16 +135,10 @@ 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 -legacy pkg=SUNWmdr arch=$(ARCH) category=system \ - desc="Solaris Volume Manager driver" \ - hotline="Please contact your local service provider" \ - name="Solaris Volume Manager, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWmdu arch=$(ARCH) category=system \ - desc="Solaris Volume Manager commands" \ - hotline="Please contact your local service provider" \ - name="Solaris Volume Manager, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWmdr desc="Solaris Volume Manager driver" \ + name="Solaris Volume Manager, (Root)" +legacy pkg=SUNWmdu desc="Solaris Volume Manager commands" \ + name="Solaris Volume Manager, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=lib/libmeta.so target=libmeta.so.1 diff --git a/usr/src/pkg/manifests/system-accounting-legacy.mf b/usr/src/pkg/manifests/system-accounting-legacy.mf index 01f3197ad6..2259a628ba 100644 --- a/usr/src/pkg/manifests/system-accounting-legacy.mf +++ b/usr/src/pkg/manifests/system-accounting-legacy.mf @@ -100,16 +100,12 @@ 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 -legacy pkg=SUNWaccr arch=$(ARCH) category=system \ +legacy pkg=SUNWaccr \ desc="utilities for accounting and reporting of system activity" \ - hotline="Please contact your local service provider" \ - name="System Accounting, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWaccu arch=$(ARCH) category=system \ + name="System Accounting, (Root)" +legacy pkg=SUNWaccu \ desc="utilities for accounting and reporting of system activity" \ - hotline="Please contact your local service provider" \ - name="System Accounting, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="System Accounting, (Usr)" 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-boot-grub.mf b/usr/src/pkg/manifests/system-boot-grub.mf index 1de2c772ac..0f1ee6d538 100644 --- a/usr/src/pkg/manifests/system-boot-grub.mf +++ b/usr/src/pkg/manifests/system-boot-grub.mf @@ -70,16 +70,11 @@ $(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 -$(i386_ONLY)legacy pkg=SUNWgrub arch=$(ARCH) category=system \ - desc="Multiboot Boot Loader" \ - hotline="Please contact your local service provider" \ - name="GNU GRUB - GNU GRand Unified Bootloader" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWgrubr arch=$(ARCH) category=system desc="GRUB libraries" \ - hotline="Please contact your local service provider" name="GRUB (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +$(i386_ONLY)legacy pkg=SUNWgrub desc="Multiboot Boot Loader" \ + name="GNU GRUB - GNU GRand Unified Bootloader" +legacy pkg=SUNWgrubr desc="GRUB libraries" name="GRUB (Root)" license cr_Sun license=cr_Sun -license grubcredits license=grubcredits license lic_CDDL license=lic_CDDL -license lic_GPLv2 license=lic_GPLv2 +license usr/src/grub/grub-0.97/AUTHORS license=usr/src/grub/grub-0.97/AUTHORS +license usr/src/grub/grub-0.97/COPYING license=usr/src/grub/grub-0.97/COPYING link path=lib/libgrubmgmt.so target=libgrubmgmt.so.1 diff --git a/usr/src/pkg/manifests/system-boot-network.mf b/usr/src/pkg/manifests/system-boot-network.mf index a52c9dd37d..40730cedf2 100644 --- a/usr/src/pkg/manifests/system-boot-network.mf +++ b/usr/src/pkg/manifests/system-boot-network.mf @@ -39,15 +39,9 @@ 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)" \ - hotline="Please contact your local service provider" \ - name="Boot Server daemons (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWbsr desc="Boot Server daemons (Root)" \ + name="Boot Server daemons (Root)" +legacy pkg=SUNWbsu desc="Boot Server daemons (Usr)" \ + name="Boot Server daemons (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-boot-real-mode.mf b/usr/src/pkg/manifests/system-boot-real-mode.mf index f96b66616a..ff0f743285 100644 --- a/usr/src/pkg/manifests/system-boot-real-mode.mf +++ b/usr/src/pkg/manifests/system-boot-real-mode.mf @@ -46,15 +46,9 @@ $(i386_ONLY)file path=boot/solaris/bootenv.rc group=sys \ $(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 -$(i386_ONLY)legacy pkg=SUNWrmodr arch=$(ARCH) category=system \ - desc="Realmode Modules, (Root)" \ - hotline="Please contact your local service provider" \ - name="Realmode Modules, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(i386_ONLY)legacy pkg=SUNWrmodu arch=$(ARCH) category=system \ - desc="Realmode Modules, (Usr)" \ - hotline="Please contact your local service provider" \ - name="Realmode Modules, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +$(i386_ONLY)legacy pkg=SUNWrmodr desc="Realmode Modules, (Root)" \ + name="Realmode Modules, (Root)" +$(i386_ONLY)legacy pkg=SUNWrmodu desc="Realmode Modules, (Usr)" \ + name="Realmode Modules, (Usr)" $(i386_ONLY)license cr_Sun license=cr_Sun $(i386_ONLY)license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf b/usr/src/pkg/manifests/system-boot-wanboot-internal.mf index 0a186d8906..9d7ec63389 100644 --- a/usr/src/pkg/manifests/system-boot-wanboot-internal.mf +++ b/usr/src/pkg/manifests/system-boot-wanboot-internal.mf @@ -44,11 +44,7 @@ file path=usr/lib/llib-lwanboot file path=usr/lib/llib-lwanboot.ln file path=usr/lib/llib-lwanbootutil file path=usr/lib/llib-lwanbootutil.ln -legacy pkg=SUNWwbint arch=$(ARCH) category=system \ - desc="Solaris WAN boot internal" \ - hotline="Please contact your local service provider" \ - name="WAN boot internal" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWwbint desc="Solaris WAN boot internal" name="WAN boot internal" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libwanboot.so target=./libwanboot.so.1 diff --git a/usr/src/pkg/manifests/system-boot-wanboot.mf b/usr/src/pkg/manifests/system-boot-wanboot.mf index 52ca1372fa..0eea83d3db 100644 --- a/usr/src/pkg/manifests/system-boot-wanboot.mf +++ b/usr/src/pkg/manifests/system-boot-wanboot.mf @@ -47,11 +47,7 @@ file path=usr/lib/libwanboot.so.1 file path=usr/lib/libwanbootutil.so.1 file path=usr/sbin/bootconfchk mode=0555 file path=usr/sbin/wanbootutil mode=0555 -legacy pkg=SUNWwbsup arch=$(ARCH) category=system \ - desc="Solaris WAN boot support" \ - hotline="Please contact your local service provider" \ - name="WAN boot support" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license common/openssl/LICENSE license=common/openssl/LICENSE +legacy pkg=SUNWwbsup desc="Solaris WAN boot support" name="WAN boot support" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/common/openssl/LICENSE license=usr/src/common/openssl/LICENSE diff --git a/usr/src/pkg/manifests/system-compatibility-sunos4.mf b/usr/src/pkg/manifests/system-compatibility-sunos4.mf index 450fe64362..9fb0c40d81 100644 --- a/usr/src/pkg/manifests/system-compatibility-sunos4.mf +++ b/usr/src/pkg/manifests/system-compatibility-sunos4.mf @@ -34,11 +34,11 @@ dir path=usr/4lib file path=usr/4lib/libc.so.1.9 file path=usr/4lib/libc.so.2.9 file path=usr/4lib/sbcp mode=0755 -legacy pkg=SUNWbcp arch=$(ARCH) category=system \ +legacy pkg=SUNWbcp \ desc="utilities to provide a binary-compatible execution environment for SunOS 4.x applications" \ - hotline="Please contact your local service provider" \ - name="SunOS 4.x Binary Compatibility" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="SunOS 4.x Binary Compatibility" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/lib/libbc/THIRDPARTYLICENSE \ + license=usr/src/lib/libbc/THIRDPARTYLICENSE link path=usr/4lib/libdl.so.1.0 target=../../lib/libdl.so.1 diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.mf b/usr/src/pkg/manifests/system-data-hardware-registry.mf index 9391395d29..b818f28a02 100644 --- a/usr/src/pkg/manifests/system-data-hardware-registry.mf +++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf @@ -35,9 +35,8 @@ dir path=usr/share group=sys dir path=usr/share/hwdata group=sys file path=usr/share/hwdata/pci.ids file path=usr/share/hwdata/usb.ids -legacy pkg=SUNWhwdata arch=$(ARCH) category=system \ +legacy pkg=SUNWhwdata \ desc="ASCII databases describing various PCI, USB and other hardware" \ - hotline="Please contact your local service provider" \ - name="Hardware data files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license lic_SUNWhwdata license=lic_SUNWhwdata + name="Hardware data files" +license usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids \ + license=usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids diff --git a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf index cf86e8fdd6..6213ab2baf 100644 --- a/usr/src/pkg/manifests/system-data-keyboard-keytables.mf +++ b/usr/src/pkg/manifests/system-data-keyboard-keytables.mf @@ -680,10 +680,8 @@ $(sparc_ONLY)hardlink path=usr/share/lib/keytables/us_5 \ target=../../../../usr/share/lib/keytables/type_4/us_5 $(sparc_ONLY)hardlink path=usr/share/lib/keytables/us_hobo \ target=../../../../usr/share/lib/keytables/type_4/us_hobo -legacy pkg=SUNWkey arch=$(ARCH) category=system \ +legacy pkg=SUNWkey \ desc="Configuration tables that specify keyboard attributes such as localized meanings for individual keys" \ - hotline="Please contact your local service provider" \ - name="Keyboard configuration tables" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Keyboard configuration tables" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-data-terminfo.mf b/usr/src/pkg/manifests/system-data-terminfo.mf index 5d420d982b..9b2fd441b0 100644 --- a/usr/src/pkg/manifests/system-data-terminfo.mf +++ b/usr/src/pkg/manifests/system-data-terminfo.mf @@ -2305,10 +2305,9 @@ hardlink path=usr/share/lib/terminfo/z/zenith \ target=../../../../../usr/share/lib/terminfo/h/h19 hardlink path=usr/share/lib/terminfo/z/zenith29 \ target=../../../../../usr/share/lib/terminfo/z/z29 -legacy pkg=SUNWter arch=$(ARCH) category=system \ +legacy pkg=SUNWter \ desc="extensive terminfo database entries describing capabilities of terminals and pseudoterminals" \ - hotline="Please contact your local service provider" \ - name="Terminal Information" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/terminfo/THIRDPARTYLICENSE license=cmd/terminfo/THIRDPARTYLICENSE + name="Terminal Information" +license usr/src/cmd/terminfo/THIRDPARTYLICENSE \ + license=usr/src/cmd/terminfo/THIRDPARTYLICENSE link path=usr/lib/tabset target=../share/lib/tabset 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 c61f2f8cfe..d5f0d27bec 100644 --- a/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf +++ b/usr/src/pkg/manifests/system-domain-configuration-sparc-enterprise.mf @@ -53,15 +53,9 @@ 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 -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 -legacy pkg=SUNWdcsu arch=$(ARCH) category=system \ - desc="Domain Configuration Server" \ - hotline="Please contact your local service provider" \ - name="Domain Configuration Server" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWdcsr desc="Domain Configuration Server, (Root)" \ + name="Domain Configuration Server, (Root)" +legacy pkg=SUNWdcsu desc="Domain Configuration Server" \ + name="Domain Configuration Server" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 10d27e4f83..a5cb501b75 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 @@ -67,16 +67,12 @@ file path=usr/platform/SUNW,SPARC-Enterprise/lib/dscp.ppp.options group=sys \ 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 -legacy pkg=SUNWdscpr.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWdscpr.u arch=$(ARCH).sun4u \ desc="Domain to Service Processor Communications Protocol (Root)" \ - hotline="Please contact your local service provider" \ - name="Domain to Service Processor Communications Protocol (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWdscpu.u arch=$(ARCH).sun4u category=system \ + name="Domain to Service Processor Communications Protocol (Root)" +legacy pkg=SUNWdscpu.u arch=$(ARCH).sun4u \ desc="Domain to Service Processor Communications Protocol (Kvm)" \ - hotline="Please contact your local service provider" \ - name="Domain to Service Processor Communications Protocol (Kvm)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Domain to Service Processor Communications Protocol (Kvm)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/platform/SUNW,SPARC-Enterprise/lib/libdscp.so \ diff --git a/usr/src/pkg/manifests/system-dtrace-tests.mf b/usr/src/pkg/manifests/system-dtrace-tests.mf index e7d5bfd3da..3c6bdaf958 100644 --- a/usr/src/pkg/manifests/system-dtrace-tests.mf +++ b/usr/src/pkg/manifests/system-dtrace-tests.mf @@ -1894,9 +1894,8 @@ $(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 -legacy pkg=SUNWdtrt arch=$(ARCH) category=internal \ +legacy pkg=SUNWdtrt category=internal \ desc="DTrace Test Suite Internal Distribution" \ - hotline="Contact the DTrace discussion forum" name="DTrace Test Suite" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + hotline="Contact the DTrace discussion forum" name="DTrace Test Suite" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf index f991d08249..955eca59b5 100644 --- a/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf +++ b/usr/src/pkg/manifests/system-embedded-fcode-interpreter.mf @@ -80,31 +80,17 @@ 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 -legacy pkg=SUNWefc.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWefc.u arch=$(ARCH).sun4u \ desc="Embedded FCode Interpreter Drivers" \ - 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=SUNWefck arch=$(ARCH) category=system \ - desc="Embedded FCode Interpreter" \ - 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" \ - hotline="Please contact your local service provider" \ - name="Embedded FCode Libraries" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWefcr arch=$(ARCH) category=system \ - desc="Embedded FCode Interpreter" \ - hotline="Please contact your local service provider" \ - name="Embedded FCode Interpreter (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWefcu arch=$(ARCH) category=system \ - desc="Embedded FCode Interpreter" \ - hotline="Please contact your local service provider" \ - name="Embedded FCode Interpreter" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Embedded FCode Interpreter Drivers" +legacy pkg=SUNWefck desc="Embedded FCode Interpreter" \ + name="Embedded FCode Interpreter Drivers" +legacy pkg=SUNWefcl desc="Embedded FCode Libraries" \ + name="Embedded FCode Libraries" +legacy pkg=SUNWefcr desc="Embedded FCode Interpreter" \ + name="Embedded FCode Interpreter (Root)" +legacy pkg=SUNWefcu desc="Embedded FCode Interpreter" \ + name="Embedded FCode Interpreter" 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 diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf index d852d3ba12..3bda6123fb 100644 --- a/usr/src/pkg/manifests/system-extended-system-utilities.mf +++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf @@ -117,6 +117,8 @@ file path=usr/bin/newform mode=0555 file path=usr/bin/news mode=0555 file path=usr/bin/nl mode=0555 file path=usr/bin/pack mode=0555 +file path=usr/bin/pginfo mode=0555 +file path=usr/bin/pgstat mode=0555 file path=usr/bin/sdiff mode=0555 file path=usr/bin/spell mode=0555 file path=usr/bin/split mode=0555 @@ -180,17 +182,19 @@ hardlink path=usr/bin/sort target=../../usr/lib/isaexec hardlink path=usr/bin/uncompress target=../../usr/bin/compress hardlink path=usr/bin/zcat target=../../usr/bin/compress hardlink path=usr/lib/fs/pcfs/fstyp target=../../../sbin/fstyp -legacy pkg=SUNWesu arch=$(ARCH) category=system \ +legacy pkg=SUNWesu \ desc="additional UNIX system utilities, including awk, bc, cal, compress, diff, dos2unix, last, rup, sort, spell, uniq, and uuencode" \ - hotline="Please contact your local service provider" \ - name="Extended System Utilities" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/compress/THIRDPARTYLICENSE license=cmd/compress/THIRDPARTYLICENSE -license cmd/lastcomm/THIRDPARTYLICENSE license=cmd/lastcomm/THIRDPARTYLICENSE -license cmd/look/THIRDPARTYLICENSE license=cmd/look/THIRDPARTYLICENSE -license cmd/units/THIRDPARTYLICENSE license=cmd/units/THIRDPARTYLICENSE + name="Extended System Utilities" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/compress/THIRDPARTYLICENSE \ + license=usr/src/cmd/compress/THIRDPARTYLICENSE +license usr/src/cmd/lastcomm/THIRDPARTYLICENSE \ + license=usr/src/cmd/lastcomm/THIRDPARTYLICENSE +license usr/src/cmd/look/THIRDPARTYLICENSE \ + license=usr/src/cmd/look/THIRDPARTYLICENSE +license usr/src/cmd/units/THIRDPARTYLICENSE \ + license=usr/src/cmd/units/THIRDPARTYLICENSE link path=usr/bin/dmesg target=../sbin/dmesg link path=usr/bin/pcat target=./unpack link path=usr/bin/strace target=../sbin/strace 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 c414304db0..b9ab32cf86 100644 --- a/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf +++ b/usr/src/pkg/manifests/system-fault-management-eversholt-utilities.mf @@ -39,10 +39,7 @@ file path=usr/lib/fm/bustcode mode=0555 file path=usr/lib/fm/dictck mode=0555 file path=usr/lib/fm/eftinfo mode=0555 file path=usr/lib/fm/esc mode=0555 -legacy pkg=SUNWonfmes arch=$(ARCH) category=system \ - desc="Sun Eversholt compiler and other utilities (ESC)" \ - hotline="Please contact your local service provider" \ - name="Eversholt unbundled utilities" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWonfmes desc="Sun Eversholt compiler and other utilities (ESC)" \ + name="Eversholt unbundled utilities" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-fault-management-mtst.mf b/usr/src/pkg/manifests/system-fault-management-mtst.mf index 5534ec644c..303cf28c7a 100644 --- a/usr/src/pkg/manifests/system-fault-management-mtst.mf +++ b/usr/src/pkg/manifests/system-fault-management-mtst.mf @@ -90,17 +90,14 @@ $(sparc_ONLY)file path=usr/platform/sun4v/include/sys/memtestio_vf.h $(i386_ONLY)legacy pkg=SUNWonmtst.i arch=$(ARCH).i86pc category=internal \ desc="CPU/memory error injector for internal testing" \ hotline="Please contact fma-interest@sun.com" \ - name="CPU/memory error injector" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="CPU/memory error injector" $(sparc_ONLY)legacy pkg=SUNWonmtst.u arch=$(ARCH).sun4u category=internal \ desc="CPU/memory error injector for internal testing" \ hotline="Please contact fma-interest@sun.com" \ - name="CPU/memory error injector" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="CPU/memory error injector" $(sparc_ONLY)legacy pkg=SUNWonmtst.v arch=$(ARCH).sun4v category=internal \ desc="CPU/memory error injector for internal testing" \ hotline="Please contact ei-support@sun.com" \ - name="CPU/memory error injector" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="CPU/memory error injector" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-file-system-autofs.mf b/usr/src/pkg/manifests/system-file-system-autofs.mf index 41a0c07f08..cb7a2124ea 100644 --- a/usr/src/pkg/manifests/system-file-system-autofs.mf +++ b/usr/src/pkg/manifests/system-file-system-autofs.mf @@ -43,28 +43,28 @@ dir path=usr/lib 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/lib/fs/autofs/$(ARCH64) group=sys dir path=usr/sbin 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 + original_name=SUNWatfs:etc/default/autofs preserve=renameold 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/$(ARCH64)/libshare_autofs.so.1 file path=usr/lib/fs/autofs/automount mode=0555 file path=usr/lib/fs/autofs/dfshares mode=0555 +file path=usr/lib/fs/autofs/libshare_autofs.so.1 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 -legacy pkg=SUNWatfsr arch=$(ARCH) category=system \ +legacy pkg=SUNWatfsr \ 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 -legacy pkg=SUNWatfsu arch=$(ARCH) category=system \ + name="AutoFS, (Root)" +legacy pkg=SUNWatfsu \ desc="utilities and a daemon (automountd) for the AutoFS filesystem" \ - hotline="Please contact your local service provider" name="AutoFS, (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="AutoFS, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/sbin/automount target=../lib/fs/autofs/automount diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf index a62f219dd5..3164d73174 100644 --- a/usr/src/pkg/manifests/system-file-system-nfs.mf +++ b/usr/src/pkg/manifests/system-file-system-nfs.mf @@ -58,7 +58,7 @@ dir path=var/nfs dir path=var/nfs/v4_oldstate group=daemon owner=daemon dir path=var/nfs/v4_state group=daemon owner=daemon file path=etc/default/nfs group=sys original_name=SUNWnfsc:etc/default/nfs \ - preserve=true + preserve=renameold file path=etc/fs/nfs/mount mode=0555 file path=etc/nfssec.conf group=sys original_name=SUNWnfsc:etc/nfssec.conf \ preserve=true @@ -94,21 +94,13 @@ file path=usr/lib/nfs/statd mode=0555 group groupname=unknown gid=96 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 \ +legacy pkg=SUNWnfsckr \ desc="Network File System (NFS) client kernel support (Root)" \ - hotline="Please contact your local service provider" \ - name="Network File System (NFS) client kernel support (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWnfscr arch=$(ARCH) category=system \ - desc="Network File System (NFS) client support (Root)" \ - hotline="Please contact your local service provider" \ - name="Network File System (NFS) client support (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWnfscu arch=$(ARCH) category=system \ - desc="Network File System (NFS) client support (Usr)" \ - hotline="Please contact your local service provider" \ - name="Network File System (NFS) client support (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Network File System (NFS) client kernel support (Root)" +legacy pkg=SUNWnfscr desc="Network File System (NFS) client support (Root)" \ + name="Network File System (NFS) client support (Root)" +legacy pkg=SUNWnfscu desc="Network File System (NFS) client support (Usr)" \ + name="Network File System (NFS) client support (Usr)" 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-file-system-ntfsprogs.mf b/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf index 18bddecae2..d0b044d098 100644 --- a/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf +++ b/usr/src/pkg/manifests/system-file-system-ntfsprogs.mf @@ -47,11 +47,13 @@ file path=usr/sbin/ntfslabel mode=0555 file path=usr/sbin/ntfsls mode=0555 file path=usr/sbin/ntfsresize mode=0555 file path=usr/sbin/ntfsundelete mode=0555 -legacy pkg=SUNWntfsprogs arch=$(ARCH) category=system \ +legacy pkg=SUNWntfsprogs \ desc="ntfsprogs are utilities that provide access to and manipulation of NTFS" \ - hotline="Please contact your local service provider" \ - name="ntfsprogs - Utilities that provide access to NTFS" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="ntfsprogs - Utilities that provide access to NTFS" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/ntfsprogs/THIRDPARTYLICENSE \ + license=usr/src/cmd/ntfsprogs/THIRDPARTYLICENSE +license usr/src/lib/libntfs/THIRDPARTYLICENSE \ + license=usr/src/lib/libntfs/THIRDPARTYLICENSE link path=usr/lib/libntfs.so target=./libntfs.so.10 diff --git a/usr/src/pkg/manifests/system-file-system-smb.mf b/usr/src/pkg/manifests/system-file-system-smb.mf index b87b2c70c4..4a87053d7e 100644 --- a/usr/src/pkg/manifests/system-file-system-smb.mf +++ b/usr/src/pkg/manifests/system-file-system-smb.mf @@ -82,31 +82,22 @@ 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 -legacy pkg=SUNWsmbfskr arch=$(ARCH) category=system \ - desc="SMB/CIFS File System client support (Kernel)" \ - hotline="Please contact your local service provider" \ - name="SMB/CIFS File System client support (Kernel)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWsmbfsr arch=$(ARCH) category=system \ - desc="SMB/CIFS File System client support (Root)" \ - hotline="Please contact your local service provider" \ - name="SMB/CIFS File System client support (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWsmbfsu arch=$(ARCH) category=system \ - desc="SMB/CIFS File System client support (Usr)" \ - hotline="Please contact your local service provider" \ - name="SMB/CIFS File System client support (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWsmbfskr desc="SMB/CIFS File System client support (Kernel)" \ + name="SMB/CIFS File System client support (Kernel)" +legacy pkg=SUNWsmbfsr desc="SMB/CIFS File System client support (Root)" \ + name="SMB/CIFS File System client support (Root)" +legacy pkg=SUNWsmbfsu desc="SMB/CIFS File System client support (Usr)" \ + name="SMB/CIFS File System client support (Usr)" license cr_Sun license=cr_Sun -license lib/libsmbfs/smb/THIRDPARTYLICENSE.apple \ - license=lib/libsmbfs/smb/THIRDPARTYLICENSE.apple -license lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov \ - license=lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov -license lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \ - license=lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 -license lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \ - license=lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft license lic_CDDL license=lic_CDDL +license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple \ + license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple +license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov \ + license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov +license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \ + license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 +license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \ + license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \ target=pam_smbfs_login.so.1 link path=usr/lib/security/pam_smbfs_login.so target=pam_smbfs_login.so.1 diff --git a/usr/src/pkg/manifests/system-file-system-udfs.mf b/usr/src/pkg/manifests/system-file-system-udfs.mf index ca84134dd4..b684b91e01 100644 --- a/usr/src/pkg/manifests/system-file-system-udfs.mf +++ b/usr/src/pkg/manifests/system-file-system-udfs.mf @@ -44,17 +44,11 @@ file path=usr/lib/fs/udfs/labelit mode=0555 file path=usr/lib/fs/udfs/mkfs mode=0555 file path=usr/lib/fs/udfs/mount mode=0555 hardlink path=usr/lib/fs/udfs/fstyp target=../../../sbin/fstyp -legacy pkg=SUNWudf arch=$(ARCH) category=system \ - desc="Universal Disk Format 1.50 File System, (Usr)" \ - hotline="Please contact your local service provider" \ - name="Universal Disk Format 1.50, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWudfr arch=$(ARCH) category=system \ - desc="Universal Disk Format 1.50 File System" \ - hotline="Please contact your local service provider" \ - name="Universal Disk Format 1.50" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE \ - license=cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE +legacy pkg=SUNWudf desc="Universal Disk Format 1.50 File System, (Usr)" \ + name="Universal Disk Format 1.50, (Usr)" +legacy pkg=SUNWudfr desc="Universal Disk Format 1.50 File System" \ + name="Universal Disk Format 1.50" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE \ + license=usr/src/cmd/fs.d/udfs/fsck/THIRDPARTYLICENSE 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 2ace5309c4..a0f2eef596 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf @@ -60,13 +60,7 @@ file path=usr/sbin/$(ARCH64)/zinject mode=0555 hardlink path=usr/bin/zlook target=../../usr/lib/isaexec hardlink path=usr/bin/ztest target=../../usr/lib/isaexec hardlink path=usr/sbin/zinject target=../../usr/lib/isaexec -legacy pkg=SUNWonzfs arch=$(ARCH) category=system desc="ZFS test commands" \ - hotline="Please contact your local service provider" \ - name="ZFS unbundled utilities" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWonzfsr arch=$(ARCH) category=system desc="ZFS test driver" \ - hotline="Please contact your local service provider" \ - name="ZFS unbundled driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWonzfs desc="ZFS test commands" name="ZFS unbundled utilities" +legacy pkg=SUNWonzfsr desc="ZFS test driver" name="ZFS unbundled driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf index f94d271136..425f3cb875 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs.mf @@ -64,9 +64,9 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/lib/mdb/proc group=sys $(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys $(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) -dir path=usr/lib/python2.4 -dir path=usr/lib/python2.4/vendor-packages -dir path=usr/lib/python2.4/vendor-packages/zfs +dir path=usr/lib/python2.6 +dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/zfs dir path=usr/lib/sysevent dir path=usr/lib/sysevent/modules dir path=usr/lib/zfs @@ -74,6 +74,9 @@ 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=etc/sysevent/config/SUNW,EC_zfs,ESC_ZFS_bootfs_vdev_attach,sysevent.conf \ + group=sys 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 @@ -89,6 +92,7 @@ file path=sbin/zpool mode=0555 file path=usr/lib/$(ARCH64)/libzfs_jni.so.1 file path=usr/lib/$(ARCH64)/libzpool.so.1 file path=usr/lib/devfsadm/linkmod/SUNW_zfs_link.so group=sys +file path=usr/lib/fs/zfs/bootinstall mode=0555 file path=usr/lib/fs/zfs/fstyp.so.1 mode=0555 file path=usr/lib/libzfs_jni.so.1 $(i386_ONLY)file path=usr/lib/libzpool.so.1 @@ -96,25 +100,25 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/zfs.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555 file path=usr/lib/mdb/proc/libzpool.so group=sys mode=0555 -file path=usr/lib/python2.4/vendor-packages/zfs/__init__.py -file path=usr/lib/python2.4/vendor-packages/zfs/__init__.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/allow.py -file path=usr/lib/python2.4/vendor-packages/zfs/allow.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/dataset.py -file path=usr/lib/python2.4/vendor-packages/zfs/dataset.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/groupspace.py -file path=usr/lib/python2.4/vendor-packages/zfs/groupspace.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/holds.py -file path=usr/lib/python2.4/vendor-packages/zfs/holds.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/ioctl.so -file path=usr/lib/python2.4/vendor-packages/zfs/table.py -file path=usr/lib/python2.4/vendor-packages/zfs/table.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/unallow.py -file path=usr/lib/python2.4/vendor-packages/zfs/unallow.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/userspace.py -file path=usr/lib/python2.4/vendor-packages/zfs/userspace.pyc -file path=usr/lib/python2.4/vendor-packages/zfs/util.py -file path=usr/lib/python2.4/vendor-packages/zfs/util.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/__init__.py +file path=usr/lib/python2.6/vendor-packages/zfs/__init__.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/allow.py +file path=usr/lib/python2.6/vendor-packages/zfs/allow.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/dataset.py +file path=usr/lib/python2.6/vendor-packages/zfs/dataset.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.py +file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/holds.py +file path=usr/lib/python2.6/vendor-packages/zfs/holds.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/ioctl.so +file path=usr/lib/python2.6/vendor-packages/zfs/table.py +file path=usr/lib/python2.6/vendor-packages/zfs/table.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/unallow.py +file path=usr/lib/python2.6/vendor-packages/zfs/unallow.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/userspace.py +file path=usr/lib/python2.6/vendor-packages/zfs/userspace.pyc +file path=usr/lib/python2.6/vendor-packages/zfs/util.py +file path=usr/lib/python2.6/vendor-packages/zfs/util.pyc file path=usr/lib/sysevent/modules/zfs_mod.so group=sys file path=usr/lib/zfs/availdevs mode=0555 file path=usr/lib/zfs/pyzfs.py mode=0555 @@ -126,18 +130,10 @@ 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 \ - desc="ZFS kernel root components" \ - hotline="Please contact your local service provider" \ - name="ZFS Kernel (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWzfsr arch=$(ARCH) category=system desc="ZFS root components" \ - hotline="Please contact your local service provider" name="ZFS (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWzfsu arch=$(ARCH) category=system \ - desc="ZFS libraries and commands" \ - hotline="Please contact your local service provider" name="ZFS (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWzfskr desc="ZFS kernel root components" \ + name="ZFS Kernel (Root)" +legacy pkg=SUNWzfsr desc="ZFS root components" name="ZFS (Root)" +legacy pkg=SUNWzfsu desc="ZFS libraries and commands" name="ZFS (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=etc/fs/zfs/mount target=../../../sbin/zfs @@ -162,3 +158,4 @@ link path=usr/lib/llib-lzfs target=../../lib/llib-lzfs link path=usr/lib/llib-lzfs.ln target=../../lib/llib-lzfs.ln link path=usr/sbin/zfs target=../../sbin/zfs link path=usr/sbin/zpool target=../../sbin/zpool +depend fmri=runtime/python-26 type=require diff --git a/usr/src/pkg/manifests/system-flash-fwflash.mf b/usr/src/pkg/manifests/system-flash-fwflash.mf index 40667b5777..aba233fdff 100644 --- a/usr/src/pkg/manifests/system-flash-fwflash.mf +++ b/usr/src/pkg/manifests/system-flash-fwflash.mf @@ -52,11 +52,8 @@ file path=usr/lib/fwflash/verify/sd-GENERIC.so file path=usr/lib/fwflash/verify/ses-SUN.so file path=usr/lib/fwflash/verify/tavor-MELLANOX.so file path=usr/sbin/fwflash mode=0555 -legacy pkg=SUNWfwflash arch=$(ARCH) category=system \ - desc="Sun Firmware Flash Update Tool (fwflash)" \ - hotline="Please contact your local service provider" \ - name="Sun Firmware Flash Update Tool (fwflash)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWfwflash desc="Sun Firmware Flash Update Tool (fwflash)" \ + name="Sun Firmware Flash Update Tool (fwflash)" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/system-floating-point-scrubber.mf b/usr/src/pkg/manifests/system-floating-point-scrubber.mf index 45e47a947b..3c157ace92 100644 --- a/usr/src/pkg/manifests/system-floating-point-scrubber.mf +++ b/usr/src/pkg/manifests/system-floating-point-scrubber.mf @@ -51,16 +51,10 @@ dir path=usr/lib/fps/sun4u/UltraSPARC-IV+ 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 -legacy pkg=SUNWfsr arch=$(ARCH) category=system \ - desc="FP Scrubber configuration files (ROOT)" \ - hotline="Please contact your local service provider" \ - name="FP Scrubber configuration files (ROOT)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWfsu arch=$(ARCH) category=system \ - desc="FP Scrubber daemon and test" \ - hotline="Please contact your local service provider" \ - name="FP Scrubber daemon and test" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWfsr desc="FP Scrubber configuration files (ROOT)" \ + name="FP Scrubber configuration files (ROOT)" +legacy pkg=SUNWfsu desc="FP Scrubber daemon and test" \ + name="FP Scrubber daemon and test" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/fps/sun4u/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 898fba2f66..d6f6e55a5e 100644 --- a/usr/src/pkg/manifests/system-fru-id-platform.mf +++ b/usr/src/pkg/manifests/system-fru-id-platform.mf @@ -199,16 +199,12 @@ $(sparc_ONLY)file path=usr/platform/sun4u/lib/libfruaccess.so.1 group=sys $(sparc_ONLY)file path=usr/platform/sun4u/lib/picl/plugins/libpiclfrudata.so.1 \ group=sys $(sparc_ONLY)file path=usr/platform/sun4u/sbin/fruadm group=sys mode=0755 -$(i386_ONLY)legacy pkg=SUNWfruip.i arch=$(ARCH).i86pc category=system \ +$(i386_ONLY)legacy pkg=SUNWfruip.i arch=$(ARCH).i86pc \ desc="FRU ID platform data module and access library" \ - hotline="Please contact your local service provider" \ - name="FRU ID Platform Modules (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWfruip.u arch=$(ARCH).sun4u category=system \ + name="FRU ID Platform Modules (Usr)" +$(sparc_ONLY)legacy pkg=SUNWfruip.u arch=$(ARCH).sun4u \ desc="FRU ID platform data module and access library" \ - hotline="Please contact your local service provider" \ - name="FRU ID Platform Modules (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="FRU ID Platform Modules (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL $(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/libfruaccess.so \ diff --git a/usr/src/pkg/manifests/system-fru-id.mf b/usr/src/pkg/manifests/system-fru-id.mf index 7f6029e77e..464c6c5e5f 100644 --- a/usr/src/pkg/manifests/system-fru-id.mf +++ b/usr/src/pkg/manifests/system-fru-id.mf @@ -47,11 +47,8 @@ file path=usr/lib/libfrureg.so.1 file path=usr/lib/libfruutils.so.1 file path=usr/lib/libnvfru.so.1 $(sparc_ONLY)file path=usr/sbin/prtfru mode=0755 -legacy pkg=SUNWfruid arch=$(ARCH) category=system \ - desc="FRU ID prtfru command and libfru library" \ - hotline="Please contact your local service provider" \ - name="FRU ID Utility and Library (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWfruid desc="FRU ID prtfru command and libfru library" \ + name="FRU ID Utility and Library (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libfru.so target=./libfru.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 a61225e8d7..bfc6bbd86a 100644 --- a/usr/src/pkg/manifests/system-header-header-agp.mf +++ b/usr/src/pkg/manifests/system-header-header-agp.mf @@ -39,12 +39,9 @@ file path=usr/include/sys/agp/agpgart_impl.h file path=usr/include/sys/agp/agpmaster_io.h file path=usr/include/sys/agp/agptarget_io.h file path=usr/include/sys/agpgart.h -legacy pkg=SUNWagph arch=$(ARCH) category=system \ - desc="AGP GART Header Files for x86 Workstations" \ - hotline="Please contact your local service provider" \ - name="AGP GART Driver Header Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWagph desc="AGP GART Header Files for x86 Workstations" \ + name="AGP GART Driver Header Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/sys/THIRDPARTYLICENSE.agpgart \ - license=uts/common/sys/THIRDPARTYLICENSE.agpgart +license usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart \ + license=usr/src/uts/common/sys/THIRDPARTYLICENSE.agpgart diff --git a/usr/src/pkg/manifests/system-header-header-audio.mf b/usr/src/pkg/manifests/system-header-header-audio.mf index bdaab784a3..f3d4a3d583 100644 --- a/usr/src/pkg/manifests/system-header-header-audio.mf +++ b/usr/src/pkg/manifests/system-header-header-audio.mf @@ -44,10 +44,8 @@ file path=usr/include/sys/audio/g711.h file path=usr/include/sys/audioio.h file path=usr/include/sys/mixer.h file path=usr/include/sys/soundcard.h -legacy pkg=SUNWaudh arch=$(ARCH) category=system \ +legacy pkg=SUNWaudh \ desc="SunOS C/C++ header files for audio drivers and applications" \ - hotline="Please contact your local service provider" \ - name="Audio Header Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Audio Header Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header-header-firewire.mf b/usr/src/pkg/manifests/system-header-header-firewire.mf index 4ae4ccaf46..1412a4d65b 100644 --- a/usr/src/pkg/manifests/system-header-header-firewire.mf +++ b/usr/src/pkg/manifests/system-header-header-firewire.mf @@ -40,10 +40,7 @@ file path=usr/include/sys/1394/ieee1394.h file path=usr/include/sys/1394/ixl1394.h file path=usr/include/sys/1394/s1394_impl.h 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 +legacy pkg=SUNW1394h desc="Sun IEEE1394 Header Files" \ + name="Sun IEEE1394 Framework Header Files" 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 7e4a67de76..6a4bacafe9 100644 --- a/usr/src/pkg/manifests/system-header-header-ifp.mf +++ b/usr/src/pkg/manifests/system-header-header-ifp.mf @@ -40,10 +40,7 @@ file path=usr/include/sys/scsi/adapters/ifpcmd.h file path=usr/include/sys/scsi/adapters/ifpmail.h file path=usr/include/sys/scsi/adapters/ifpreg.h file path=usr/include/sys/scsi/adapters/ifpvar.h -legacy pkg=SUNWifph arch=$(ARCH) category=system \ - desc="SunOS Header Files For QLogic FC-AL Family" \ - hotline="Please contact your local service provider" \ - name="Sun Fibre Channel Arbitrated Loop Driver Header Files" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWifph desc="SunOS Header Files For QLogic FC-AL Family" \ + name="Sun Fibre Channel Arbitrated Loop Driver Header Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header-header-picl.mf b/usr/src/pkg/manifests/system-header-header-picl.mf index 0ea15252cd..cc664cb8de 100644 --- a/usr/src/pkg/manifests/system-header-header-picl.mf +++ b/usr/src/pkg/manifests/system-header-header-picl.mf @@ -32,9 +32,6 @@ dir path=usr group=sys dir path=usr/include file path=usr/include/picl.h file path=usr/include/picltree.h -legacy pkg=SUNWpiclh arch=$(ARCH) category=system desc="PICL Header Files" \ - hotline="Please contact your local service provider" \ - name="PICL Header Files (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpiclh desc="PICL Header Files" name="PICL Header Files (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header-header-storage.mf b/usr/src/pkg/manifests/system-header-header-storage.mf index 2507db748d..2009f93f41 100644 --- a/usr/src/pkg/manifests/system-header-header-storage.mf +++ b/usr/src/pkg/manifests/system-header-header-storage.mf @@ -52,10 +52,8 @@ file path=usr/include/sys/dktp/tgdk.h file path=usr/include/sys/fd_debug.h file path=usr/include/sys/fdc.h file path=usr/include/sys/fdmedia.h -legacy pkg=SUNWpsh arch=$(ARCH) category=system \ +legacy pkg=SUNWpsh \ desc="SunOS C/C++ header files for development of software for device drivers specific to bus and platform" \ - hotline="Please contact your local service provider" \ - name="Platform Support, Driver Header Files" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Platform Support, Driver Header Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header-header-ugen.mf b/usr/src/pkg/manifests/system-header-header-ugen.mf index 3004fdd7ba..bab6694181 100644 --- a/usr/src/pkg/manifests/system-header-header-ugen.mf +++ b/usr/src/pkg/manifests/system-header-header-ugen.mf @@ -36,8 +36,6 @@ dir path=usr/include/sys/usb dir path=usr/include/sys/usb/clients dir path=usr/include/sys/usb/clients/ugen file path=usr/include/sys/usb/clients/ugen/usb_ugen.h -legacy pkg=SUNWugenu arch=$(ARCH) category=system desc="UGEN Headers" \ - hotline="Please contact your local service provider" name="UGEN Headers" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWugenu desc="UGEN Headers" name="UGEN Headers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header-header-usb.mf b/usr/src/pkg/manifests/system-header-header-usb.mf index b4bca75d91..d9c8b49b57 100644 --- a/usr/src/pkg/manifests/system-header-header-usb.mf +++ b/usr/src/pkg/manifests/system-header-header-usb.mf @@ -63,9 +63,7 @@ file path=usr/include/sys/usb/usbdevs.h file path=usr/include/sys/uwb/uwb.h file path=usr/include/sys/uwb/uwba/uwba.h file path=usr/include/sys/uwb/uwbai.h -legacy pkg=SUNWusbu arch=$(ARCH) category=system desc="USB Headers" \ - hotline="Please contact your local service provider" name="USB Headers" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWusbu desc="USB Headers" name="USB Headers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license license_in_headers license=license_in_headers diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 9100baf57e..6d0b70fcec 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -91,6 +91,7 @@ dir path=usr/include/sys/ib/clients/of dir path=usr/include/sys/ib/clients/of/rdma dir path=usr/include/sys/ib/clients/of/sol_ofs dir path=usr/include/sys/ib/clients/of/sol_ucma +dir path=usr/include/sys/ib/clients/of/sol_umad dir path=usr/include/sys/ib/clients/of/sol_uverbs dir path=usr/include/sys/ib/ibnex dir path=usr/include/sys/ib/ibtl @@ -1076,10 +1077,14 @@ $(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/ib/adapters/hermon/hermon_ioctl.h +file path=usr/include/sys/ib/adapters/mlnx_umap.h file path=usr/include/sys/ib/adapters/tavor/tavor_ioctl.h file path=usr/include/sys/ib/clients/ibd/ibd.h file path=usr/include/sys/ib/clients/of/ofa_solaris.h file path=usr/include/sys/ib/clients/of/ofed_kernel.h +file path=usr/include/sys/ib/clients/of/rdma/ib_addr.h +file path=usr/include/sys/ib/clients/of/rdma/ib_user_mad.h +file path=usr/include/sys/ib/clients/of/rdma/ib_user_sa.h file path=usr/include/sys/ib/clients/of/rdma/ib_user_verbs.h file path=usr/include/sys/ib/clients/of/rdma/ib_verbs.h file path=usr/include/sys/ib/clients/of/rdma/rdma_cm.h @@ -1090,6 +1095,7 @@ 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_umad/sol_umad.h file path=usr/include/sys/ib/clients/of/sol_uverbs/sol_uverbs.h file path=usr/include/sys/ib/clients/of/sol_uverbs/sol_uverbs2ucma.h file path=usr/include/sys/ib/clients/of/sol_uverbs/sol_uverbs_comp.h @@ -1676,6 +1682,7 @@ file path=usr/include/wordexp.h file path=usr/include/xti.h file path=usr/include/xti_inet.h file path=usr/include/zone.h +file path=usr/include/zonestat.h $(i386_ONLY)file path=usr/platform/i86pc/include/sys/acpidev.h $(i386_ONLY)file path=usr/platform/i86pc/include/sys/amd_iommu.h $(i386_ONLY)file path=usr/platform/i86pc/include/sys/asm_misc.h @@ -1842,14 +1849,14 @@ $(sparc_ONLY)file path=usr/platform/sun4v/include/vm/mach_sfmmu.h file path=usr/xpg4/include/curses.h file path=usr/xpg4/include/term.h file path=usr/xpg4/include/unctrl.h -legacy pkg=SUNWhea arch=$(ARCH) category=system \ +legacy pkg=SUNWhea \ desc="SunOS C/C++ header files for general development of software" \ - hotline="Please contact your local service provider" \ - name="SunOS Header Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="SunOS Header Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license license_in_headers license=license_in_headers +license usr/src/lib/pkcs11/include/THIRDPARTYLICENSE \ + license=usr/src/lib/pkcs11/include/THIRDPARTYLICENSE link path=usr/include/iso/assert_iso.h target=../assert.h link path=usr/include/iso/errno_iso.h target=../errno.h link path=usr/include/iso/float_iso.h target=../float.h diff --git a/usr/src/pkg/manifests/system-io-tests.mf b/usr/src/pkg/manifests/system-io-tests.mf index ac11a24fc9..8035c0b117 100644 --- a/usr/src/pkg/manifests/system-io-tests.mf +++ b/usr/src/pkg/manifests/system-io-tests.mf @@ -60,14 +60,8 @@ file path=usr/lib/scsi/sestopo mode=0555 file path=usr/lib/scsi/smp mode=0555 file path=usr/sbin/devctl mode=0555 file path=usr/sbin/emul64ioctl mode=0555 -legacy pkg=SUNWioth arch=$(ARCH) category=system desc="I/O Test Header Files" \ - hotline="Please contact your local service provider" \ - name="I/O Test Header Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWiotu arch=$(ARCH) category=system \ - desc="I/O test utilities and drivers" \ - hotline="Please contact your local service provider" \ - name="I/O test utilities and drivers, (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWioth desc="I/O Test Header Files" name="I/O Test Header Files" +legacy pkg=SUNWiotu desc="I/O test utilities and drivers" \ + name="I/O test utilities and drivers, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-ipc.mf b/usr/src/pkg/manifests/system-ipc.mf index 194f7877fa..60a51d49ed 100644 --- a/usr/src/pkg/manifests/system-ipc.mf +++ b/usr/src/pkg/manifests/system-ipc.mf @@ -33,11 +33,9 @@ dir path=usr group=sys dir path=usr/bin file path=usr/bin/ipcrm mode=0555 file path=usr/bin/ipcs mode=0555 -legacy pkg=SUNWipc arch=$(ARCH) category=system \ +legacy pkg=SUNWipc \ desc="utilities to monitor or remove messages, semaphores, or shared memory for interprocess communication" \ - hotline="Please contact your local service provider" \ - name="Interprocess Communications" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Interprocess Communications" 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-kernel-cpu-counters.mf b/usr/src/pkg/manifests/system-kernel-cpu-counters.mf index f8e3eaee62..9c3538809a 100644 --- a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf +++ b/usr/src/pkg/manifests/system-kernel-cpu-counters.mf @@ -68,20 +68,14 @@ $(sparc_ONLY)hardlink path=platform/sun4u/kernel/sys/$(ARCH64)/cpc \ target=../../drv/$(ARCH64)/cpc $(sparc_ONLY)hardlink path=platform/sun4v/kernel/sys/$(ARCH64)/cpc \ target=../../drv/$(ARCH64)/cpc -$(i386_ONLY)legacy pkg=SUNWcpc.i arch=$(ARCH).i86pc category=system \ +$(i386_ONLY)legacy pkg=SUNWcpc.i arch=$(ARCH).i86pc \ desc="Kernel support for CPU Performance Counters" \ - hotline="Please contact your local service provider" \ - name="CPU Performance Counter driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcpc.u arch=$(ARCH).sun4u category=system \ + name="CPU Performance Counter driver" +$(sparc_ONLY)legacy pkg=SUNWcpc.u arch=$(ARCH).sun4u \ desc="Kernel support for CPU Performance Counters" \ - hotline="Please contact your local service provider" \ - name="CPU Performance Counter driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcpc.v arch=$(ARCH).sun4v category=system \ + name="CPU Performance Counter driver" +$(sparc_ONLY)legacy pkg=SUNWcpc.v arch=$(ARCH).sun4v \ desc="Kernel support for CPU Performance Counters" \ - hotline="Please contact your local service provider" \ - name="CPU Performance Counter driver" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="CPU Performance Counter driver" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf index 7e277770c0..6efd69b462 100644 --- a/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf +++ b/usr/src/pkg/manifests/system-kernel-cpu-sun4v.mf @@ -41,31 +41,26 @@ dir path=platform/sun4v/kernel/cpu group=sys 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)/SPARC-T3 group=sys mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T1 group=sys \ mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2 group=sys \ mode=0755 file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T2+ group=sys \ mode=0755 -file path=platform/sun4v/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-T3 group=sys \ - 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 -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" \ - name="UltraSPARC-T1 (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWust2.v arch=$(ARCH).sun4v category=system \ +file path=platform/sun4v/kernel/pcbe/sparcv9/pcbe.SPARC-T3 group=sys mode=0755 +legacy pkg=SUNWust1.v arch=$(ARCH).sun4v \ + desc="UltraSPARC-T1 core kernel software" name="UltraSPARC-T1 (Root)" +legacy pkg=SUNWust2.v arch=$(ARCH).sun4v \ desc="UltraSPARC-T2 family core kernel software" \ - hotline="Please contact your local service provider" \ - name="UltraSPARC-T2 family (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="UltraSPARC-T2 family (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE \ + license=usr/src/uts/sun4v/pcbe/THIRDPARTYLICENSE 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 5c2dbe1403..04e8ef3346 100644 --- a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf +++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf @@ -45,10 +45,8 @@ 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 -legacy pkg=SUNWxdt arch=$(ARCH) category=system \ +legacy pkg=SUNWxdt \ desc="DTrace provider for tracing events in the xVM hypervisor" \ - hotline="Please contact your local service provider" \ - name="xVM Hypervisor Dynamic Tracing (DTrace) Provider" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="xVM Hypervisor Dynamic Tracing (DTrace) Provider" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf index afddd5a9cb..d8a1eb5dbd 100644 --- a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf +++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf @@ -97,10 +97,7 @@ $(i386_ONLY)hardlink path=kernel/dtrace/profile \ $(i386_ONLY)hardlink path=kernel/dtrace/sdt target=../../kernel/drv/sdt $(i386_ONLY)hardlink path=kernel/dtrace/systrace \ target=../../kernel/drv/systrace -legacy pkg=SUNWdtrp arch=$(ARCH) category=system \ - desc="Dynamic Tracing (DTrace) Providers" \ - hotline="Please contact your local service provider" \ - name="DTrace Providers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWdtrp desc="Dynamic Tracing (DTrace) Providers" \ + name="DTrace Providers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 924d56e989..2756242d7d 100644 --- a/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf +++ b/usr/src/pkg/manifests/system-kernel-dynamic-reconfiguration-i86pc.mf @@ -66,9 +66,10 @@ 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 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 +license usr/src/cmd/acpihpd/THIRDPARTYLICENSE \ + license=usr/src/cmd/acpihpd/THIRDPARTYLICENSE 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 bcaf924b02..36bd1927d1 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 @@ -55,10 +55,8 @@ 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 -legacy pkg=SUNWdrcr.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWdrcr.u arch=$(ARCH).sun4u \ desc="Dynamic Reconfiguration Modules for Sun Fire 15000" \ - hotline="Please contact your local service provider" \ - name="Dynamic Reconfiguration Modules for Sun Fire 15000" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Dynamic Reconfiguration Modules for Sun Fire 15000" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 3511bd3f28..4d31263300 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 @@ -51,16 +51,11 @@ dir path=usr/platform/SUNW,Sun-Fire-V890/lib 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 -legacy pkg=SUNWsfdr.u arch=$(ARCH).sun4u category=system \ - desc="Sun Fire 880 DR Daemon" \ - hotline="Please contact your local service provider" \ - name="Sun Fire 880 DR Daemon" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsfdrr.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWsfdr.u arch=$(ARCH).sun4u desc="Sun Fire 880 DR Daemon" \ + name="Sun Fire 880 DR Daemon" +legacy pkg=SUNWsfdrr.u arch=$(ARCH).sun4u \ desc="DR Daemon support for Sun Fire 880, (Root)" \ - hotline="Please contact your local service provider" \ - name="Sun Fire 880 DR Daemon service method" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun Fire 880 DR Daemon service method" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/platform/SUNW,Sun-Fire-V890/lib/sf880drd \ 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 d93512c6eb..41a5c074a3 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 @@ -53,10 +53,8 @@ file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/ngdr.conf group=sys \ preserve=true file path=platform/SUNW,Ultra-Enterprise-10000/kernel/misc/$(ARCH64)/ngdrmach \ group=sys mode=0755 -legacy pkg=SUNWdrr.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWdrr.u arch=$(ARCH).sun4u \ desc="Dynamic Reconfiguration Modules for Sun Enterprise 10000" \ - hotline="Please contact your local service provider" \ - name="Dynamic Reconfiguration Modules for Sun Enterprise 10000" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Dynamic Reconfiguration Modules for Sun Enterprise 10000" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 8e67cb73d3..f730225c80 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 @@ -49,10 +49,8 @@ file path=platform/SUNW,Ultra-Enterprise-10000/kernel/drv/$(ARCH64)/idn \ 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 -legacy pkg=SUNWidn.u arch=$(ARCH).sun4u category=system \ +legacy pkg=SUNWidn.u arch=$(ARCH).sun4u \ desc="Inter-Domain Network Modules for Sun Enterprise 10000" \ - hotline="Please contact your local service provider" \ - name="Inter-Domain Network Modules for Sun Enterprise 10000" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Inter-Domain Network Modules for Sun Enterprise 10000" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 ccf0ae0f15..97a6572115 100644 --- a/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf +++ b/usr/src/pkg/manifests/system-kernel-io-performance-counters.mf @@ -67,16 +67,12 @@ file path=platform/sun4v/kernel/drv/$(ARCH64)/n2piupc group=sys 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 \ +legacy pkg=SUNWiopc.u arch=$(ARCH).sun4u \ desc="Kernel support for IO chip performance counters" \ - hotline="Please contact your local service provider" \ - name="sun4u IO chip performance counter modules" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWiopc.v arch=$(ARCH).sun4v category=system \ + name="sun4u IO chip performance counter modules" +legacy pkg=SUNWiopc.v arch=$(ARCH).sun4v \ desc="Kernel support for IO chip performance counters" \ - hotline="Please contact your local service provider" \ - name="sun4v IO chip performance counter modules" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="sun4v IO chip performance counter modules" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=platform/SUNW,Sun-Fire-V215/kernel/drv/$(ARCH64)/fpc \ diff --git a/usr/src/pkg/manifests/system-kernel-platform-netra.mf b/usr/src/pkg/manifests/system-kernel-platform-netra.mf index 647117ecd3..bea797da77 100644 --- a/usr/src/pkg/manifests/system-kernel-platform-netra.mf +++ b/usr/src/pkg/manifests/system-kernel-platform-netra.mf @@ -80,11 +80,9 @@ 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 \ +legacy pkg=SUNWcti2.u arch=$(ARCH).sun4u \ desc="I2C and System Controller and Status Drivers for Netra ct cPCI platform" \ - hotline="Please contact your local service provider" \ - name="Netra ct I2C and System Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Netra ct I2C and System Drivers" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=platform/SUNW,Netra-CP2300/kernel/dacf/$(ARCH64)/ttymux_dacf \ diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.mf index 32c994104a..07779f2b58 100644 --- a/usr/src/pkg/manifests/system-kernel-platform.mf +++ b/usr/src/pkg/manifests/system-kernel-platform.mf @@ -821,9 +821,6 @@ $(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \ $(i386_ONLY)file \ path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.46 \ group=sys mode=0755 -$(i386_ONLY)hardlink \ - path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.47 \ - target=cpu_ms.GenuineIntel.6.46 $(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 \ @@ -834,9 +831,6 @@ $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel group=sys \ mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46 \ group=sys mode=0755 -$(i386_ONLY)hardlink \ - path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47 \ - target=cpu_ms.GenuineIntel.6.46 $(i386_ONLY)file path=platform/i86pc/kernel/dacf/$(ARCH64)/consconfig_dacf \ group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/dacf/consconfig_dacf group=sys \ @@ -866,15 +860,15 @@ $(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm group=sys $(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 -$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/pcplusmp group=sys \ - mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/apix group=sys \ mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/pcplusmp group=sys \ + mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/uppc group=sys \ mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/mach/apix group=sys 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/mach/apix group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/acpidev group=sys \ mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/gfx_private \ @@ -1162,42 +1156,45 @@ $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/platmod group=sys \ $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/vis group=sys \ mode=0755 $(sparc_ONLY)file path=platform/sun4v/wanboot group=sys reboot-needed=true +$(i386_ONLY)hardlink \ + path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.47 \ + target=cpu_ms.GenuineIntel.6.46 +$(i386_ONLY)hardlink path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47 \ + target=cpu_ms.GenuineIntel.6.46 $(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/md5 \ target=../../../kernel/crypto/$(ARCH64)/md5 $(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/sha1 \ target=../../../kernel/crypto/$(ARCH64)/sha1 $(sparc_ONLY)hardlink path=platform/sun4v/kernel/misc/$(ARCH64)/md5 \ target=../../../kernel/crypto/$(ARCH64)/md5 -$(i386_ONLY)legacy pkg=SUNWcakr.i arch=$(ARCH).i86pc category=system \ +$(i386_ONLY)legacy pkg=SUNWcakr.i arch=$(ARCH).i86pc \ desc="core kernel software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Kernel Architecture (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcakr.u arch=$(ARCH).sun4u category=system \ + name="Core Solaris Kernel Architecture (Root)" +$(sparc_ONLY)legacy pkg=SUNWcakr.u arch=$(ARCH).sun4u \ desc="core kernel software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Kernel Architecture (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcakr.v arch=$(ARCH).sun4v category=system \ + name="Core Solaris Kernel Architecture (Root)" +$(sparc_ONLY)legacy pkg=SUNWcakr.v arch=$(ARCH).sun4v \ desc="core kernel software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Kernel Architecture (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcakrnt2000.v arch=$(ARCH).sun4v category=system \ + name="Core Solaris Kernel Architecture (Root)" +$(sparc_ONLY)legacy pkg=SUNWcakrnt2000.v arch=$(ARCH).sun4v \ desc="driver software for the Netra-T2000 hardware platform" \ - hotline="Please contact your local service provider" \ - name="Platform Specific Drivers for Netra-T2000, (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -$(i386_ONLY)legacy pkg=SUNWcakrx.i arch=$(ARCH).i86pc category=system \ + name="Platform Specific Drivers for Netra-T2000, (Root)" +$(i386_ONLY)legacy pkg=SUNWcakrx.i arch=$(ARCH).i86pc \ desc="core kernel software for the i86xpv virtual hardware platform" \ - hotline="Please contact your local service provider" \ - name="Core Kernel Architecture i86xpv, (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Core Kernel Architecture i86xpv, (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/sys/THIRDPARTYLICENSE.unicode \ - license=uts/common/sys/THIRDPARTYLICENSE.unicode -license uts/intel/THIRDPARTYLICENSE license=uts/intel/THIRDPARTYLICENSE +license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \ + license=usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE +license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE +$(sparc_ONLY)license usr/src/stand/lib/tcp/THIRDPARTYLICENSE \ + license=usr/src/stand/lib/tcp/THIRDPARTYLICENSE +license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \ + license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode +license usr/src/uts/common/zmod/THIRDPARTYLICENSE \ + license=usr/src/uts/common/zmod/THIRDPARTYLICENSE +$(i386_ONLY)license usr/src/uts/intel/THIRDPARTYLICENSE \ + license=usr/src/uts/intel/THIRDPARTYLICENSE $(sparc_ONLY)link path=platform/SUNW,A70/kernel/crypto/$(ARCH64)/aes \ target=../../../../sun4u-us3/kernel/crypto/$(ARCH64)/aes $(sparc_ONLY)link path=platform/SUNW,Netra-CP3010/kernel/crypto/$(ARCH64)/aes \ diff --git a/usr/src/pkg/manifests/system-kernel-power.mf b/usr/src/pkg/manifests/system-kernel-power.mf index 301273701a..3dc01224d8 100644 --- a/usr/src/pkg/manifests/system-kernel-power.mf +++ b/usr/src/pkg/manifests/system-kernel-power.mf @@ -63,15 +63,9 @@ 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 -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" \ - hotline="Please contact your local service provider" \ - name="Power Management binaries" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpmr desc="Power Management config file and rc script" \ + name="Power Management config file and rc script" +legacy pkg=SUNWpmu desc="Power Management binaries" \ + name="Power Management binaries" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-rsmops.mf b/usr/src/pkg/manifests/system-kernel-rsmops.mf index b137f79062..672be3d28e 100644 --- a/usr/src/pkg/manifests/system-kernel-rsmops.mf +++ b/usr/src/pkg/manifests/system-kernel-rsmops.mf @@ -41,10 +41,8 @@ dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys 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 \ +legacy pkg=SUNWrsmo \ 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" 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 c5a30bf964..c08d11f4af 100644 --- a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf +++ b/usr/src/pkg/manifests/system-kernel-secure-rpc.mf @@ -39,10 +39,7 @@ dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys 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" \ - name="kernel RPCSEC_GSS" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWrsgk desc="kernel GSS-API services for ONC RPC" \ + name="kernel RPCSEC_GSS" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-security-gss.mf b/usr/src/pkg/manifests/system-kernel-security-gss.mf index b7175a7b8d..9a2fe74b33 100644 --- a/usr/src/pkg/manifests/system-kernel-security-gss.mf +++ b/usr/src/pkg/manifests/system-kernel-security-gss.mf @@ -45,10 +45,8 @@ 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 \ +legacy pkg=SUNWgssk \ desc="Generic Security Service Application Program Interface, Version 2 - kernel" \ - hotline="Please contact your local service provider" \ - name="kernel GSSAPI V2" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \ - license=uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE + name="kernel GSSAPI V2" +license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \ + license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf b/usr/src/pkg/manifests/system-kernel-suspend-resume.mf index 41e9628bc0..88dd1ddb35 100644 --- a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf +++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.mf @@ -61,15 +61,9 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/tod group=sys $(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 -$(i386_ONLY)legacy pkg=SUNWcpr.i arch=$(ARCH).i86pc category=system \ - desc="Suspend, Resume package" \ - hotline="Please contact your local service provider" \ - name="Suspend, Resume package" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcpr.u arch=$(ARCH).sun4u category=system \ - desc="Suspend, Resume package" \ - hotline="Please contact your local service provider" \ - name="Suspend, Resume package" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +$(i386_ONLY)legacy pkg=SUNWcpr.i arch=$(ARCH).i86pc \ + desc="Suspend, Resume package" name="Suspend, Resume package" +$(sparc_ONLY)legacy pkg=SUNWcpr.u arch=$(ARCH).sun4u \ + desc="Suspend, Resume package" name="Suspend, Resume package" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf b/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf index 5f9a6a702a..4672669dbe 100644 --- a/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf +++ b/usr/src/pkg/manifests/system-kernel-ultra-wideband.mf @@ -40,10 +40,7 @@ dir path=kernel/misc group=sys dir path=kernel/misc/$(ARCH64) group=sys 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 +legacy pkg=SUNWuwb desc="Common framework for UWB device drivers" \ + name="Ultra Wideband (UWB) support modules" 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 b01a279634..832fb7468c 100644 --- a/usr/src/pkg/manifests/system-kernel.mf +++ b/usr/src/pkg/manifests/system-kernel.mf @@ -42,6 +42,7 @@ dir path=boot/solaris group=sys dir path=boot/solaris/bin group=sys dir path=etc group=sys dir path=etc/crypto group=sys +dir path=etc/sock2path.d group=sys dir path=kernel group=sys $(i386_ONLY)dir path=kernel/$(ARCH64) group=sys dir path=kernel/crypto group=sys @@ -265,6 +266,7 @@ 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/sock2path.d/system%2Fkernel group=sys file path=etc/system group=sys original_name=SUNWckr:etc/system preserve=true $(i386_ONLY)file path=kernel/$(ARCH64)/genunix group=sys mode=0755 file path=kernel/crypto/$(ARCH64)/aes group=sys mode=0755 @@ -773,7 +775,6 @@ $(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 @@ -833,36 +834,38 @@ hardlink path=kernel/sys/$(ARCH64)/rpcmod \ target=../../../kernel/strmod/$(ARCH64)/rpcmod $(i386_ONLY)hardlink path=kernel/sys/autofs target=../../kernel/fs/autofs $(i386_ONLY)hardlink path=kernel/sys/rpcmod target=../../kernel/strmod/rpcmod -legacy pkg=SUNWckr arch=$(ARCH) category=system \ +legacy pkg=SUNWckr \ desc="core kernel software for a specific instruction-set architecture" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Kernel (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license common/crypto/THIRDPARTYLICENSE.cryptogams \ - license=common/crypto/THIRDPARTYLICENSE.cryptogams -license common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \ - license=common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman -license common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \ - license=common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl -license common/crypto/ecc/THIRDPARTYLICENSE \ - license=common/crypto/ecc/THIRDPARTYLICENSE -license common/crypto/md5/amd64/THIRDPARTYLICENSE \ - license=common/crypto/md5/amd64/THIRDPARTYLICENSE -license common/mpi/THIRDPARTYLICENSE license=common/mpi/THIRDPARTYLICENSE + name="Core Solaris Kernel (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/inet/ip/THIRDPARTYLICENSE.rts \ - license=uts/common/inet/ip/THIRDPARTYLICENSE.rts -license uts/common/inet/tcp/THIRDPARTYLICENSE \ - license=uts/common/inet/tcp/THIRDPARTYLICENSE -license uts/common/io/THIRDPARTYLICENSE.etheraddr \ - license=uts/common/io/THIRDPARTYLICENSE.etheraddr -license uts/common/sys/THIRDPARTYLICENSE.icu \ - license=uts/common/sys/THIRDPARTYLICENSE.icu -license uts/common/sys/THIRDPARTYLICENSE.unicode \ - license=uts/common/sys/THIRDPARTYLICENSE.unicode -license uts/intel/io/acpica/THIRDPARTYLICENSE \ - license=uts/intel/io/acpica/THIRDPARTYLICENSE +license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \ + license=usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE +license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE +license usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams \ + license=usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams +$(i386_ONLY)license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \ + license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman +$(i386_ONLY)license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \ + license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl +license usr/src/common/crypto/ecc/THIRDPARTYLICENSE \ + license=usr/src/common/crypto/ecc/THIRDPARTYLICENSE +$(i386_ONLY)license usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE \ + license=usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE +license usr/src/common/mpi/THIRDPARTYLICENSE \ + license=usr/src/common/mpi/THIRDPARTYLICENSE +license usr/src/uts/common/inet/ip/THIRDPARTYLICENSE.rts \ + license=usr/src/uts/common/inet/ip/THIRDPARTYLICENSE.rts +license usr/src/uts/common/inet/tcp/THIRDPARTYLICENSE \ + license=usr/src/uts/common/inet/tcp/THIRDPARTYLICENSE +license usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr \ + license=usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr +license usr/src/uts/common/sys/THIRDPARTYLICENSE.icu \ + license=usr/src/uts/common/sys/THIRDPARTYLICENSE.icu +license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \ + license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode +$(i386_ONLY)license usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE \ + license=usr/src/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 diff --git a/usr/src/pkg/manifests/system-ldoms.mf b/usr/src/pkg/manifests/system-ldoms.mf index 162cb1d11e..4c87d90732 100644 --- a/usr/src/pkg/manifests/system-ldoms.mf +++ b/usr/src/pkg/manifests/system-ldoms.mf @@ -102,15 +102,11 @@ 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 -legacy pkg=SUNWldomr.v arch=$(ARCH).sun4v category=system \ +legacy pkg=SUNWldomr.v arch=$(ARCH).sun4v \ desc="Solaris Logical Domains Configuration Files" \ - hotline="Please contact your local service provider" \ - name="Solaris Logical Domains (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWldomu.v arch=$(ARCH).sun4v category=system \ + name="Solaris Logical Domains (Root)" +legacy pkg=SUNWldomu.v arch=$(ARCH).sun4v \ desc="Solaris Logical Domains Configuration and Administration" \ - hotline="Please contact your local service provider" \ - name="Solaris Logical Domains (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Solaris Logical Domains (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-library-install-libinstzones.mf b/usr/src/pkg/manifests/system-library-install-libinstzones.mf index 889752cabd..6051fb484c 100644 --- a/usr/src/pkg/manifests/system-library-install-libinstzones.mf +++ b/usr/src/pkg/manifests/system-library-install-libinstzones.mf @@ -33,11 +33,8 @@ dir path=usr group=sys dir path=usr/include dir path=usr/lib file path=usr/include/instzones_api.h -legacy pkg=SUNWinstallint arch=$(ARCH) category=system \ - desc="Solaris Install internal files" \ - hotline="Please contact your local service provider" \ - name="Solaris Install Internal Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWinstallint desc="Solaris Install internal files" \ + name="Solaris Install Internal Files" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libinstzones.so target=./libinstzones.so.1 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 7f57d50412..4492e17127 100644 --- a/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf +++ b/usr/src/pkg/manifests/system-library-libdiskmgt-header-libdiskmgt.mf @@ -33,10 +33,7 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/include file path=usr/include/libdiskmgt.h -legacy pkg=SUNWldskint arch=$(ARCH) category=system \ - desc="libdiskmgt private header file pkg" \ - hotline="Please contact your local service provider" \ - name="libdiskmgt private header file pkg" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWldskint desc="libdiskmgt private header file pkg" \ + name="libdiskmgt private header file pkg" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-library-libdiskmgt.mf b/usr/src/pkg/manifests/system-library-libdiskmgt.mf index 2c1763fa1f..84bf811b47 100644 --- a/usr/src/pkg/manifests/system-library-libdiskmgt.mf +++ b/usr/src/pkg/manifests/system-library-libdiskmgt.mf @@ -37,11 +37,8 @@ file path=usr/lib/$(ARCH64)/llib-ldiskmgt.ln file path=usr/lib/libdiskmgt.so.1 file path=usr/lib/llib-ldiskmgt file path=usr/lib/llib-ldiskmgt.ln -legacy pkg=SUNWsmapi arch=$(ARCH) category=system \ - desc="Software libraries for storage management" \ - hotline="Please contact your local service provider" \ - name="Storage Management APIs" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWsmapi desc="Software libraries for storage management" \ + name="Storage Management APIs" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libdiskmgt.so target=./libdiskmgt.so.1 diff --git a/usr/src/pkg/manifests/system-library-libfcoe.mf b/usr/src/pkg/manifests/system-library-libfcoe.mf index a16f4cb85d..e7ad0a0635 100644 --- a/usr/src/pkg/manifests/system-library-libfcoe.mf +++ b/usr/src/pkg/manifests/system-library-libfcoe.mf @@ -40,11 +40,9 @@ file path=usr/lib/$(ARCH64)/llib-lfcoe.ln file path=usr/lib/libfcoe.so.1 file path=usr/lib/llib-lfcoe file path=usr/lib/llib-lfcoe.ln -legacy pkg=SUNWfcoeu arch=$(ARCH) category=system \ +legacy pkg=SUNWfcoeu \ desc="Sun FCoE (Fibre Channel over Ethernet) Port Management Library" \ - hotline="Please contact your local service provider" \ - name="Sun FCoE Port Management Library" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun FCoE Port Management Library" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libfcoe.so target=libfcoe.so.1 diff --git a/usr/src/pkg/manifests/system-library-platform.mf b/usr/src/pkg/manifests/system-library-platform.mf index 8150922c50..934b616f20 100644 --- a/usr/src/pkg/manifests/system-library-platform.mf +++ b/usr/src/pkg/manifests/system-library-platform.mf @@ -194,26 +194,18 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/libprtdiag.so.1 $(sparc_ONLY)file path=usr/platform/sun4v/lib/libtsalarm.so.1 $(sparc_ONLY)file path=usr/platform/sun4v/sbin/device_remap mode=0544 $(sparc_ONLY)file path=usr/platform/sun4v/sbin/prtdiag group=sys mode=2755 -$(i386_ONLY)legacy pkg=SUNWkvm.i arch=$(ARCH).i86pc category=system \ +$(i386_ONLY)legacy pkg=SUNWkvm.i arch=$(ARCH).i86pc \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, (Kvm)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWkvm.u arch=$(ARCH).sun4u category=system \ + name="Core Architecture, (Kvm)" +$(sparc_ONLY)legacy pkg=SUNWkvm.u arch=$(ARCH).sun4u \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, (Kvm)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWkvm.v arch=$(ARCH).sun4v category=system \ + name="Core Architecture, (Kvm)" +$(sparc_ONLY)legacy pkg=SUNWkvm.v arch=$(ARCH).sun4v \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, (Kvm)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWkvmt200.v arch=$(ARCH).sun4v category=system \ + name="Core Architecture, (Kvm)" +$(sparc_ONLY)legacy pkg=SUNWkvmt200.v arch=$(ARCH).sun4v \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, sun4v-based platforms (Kvm)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Core Architecture, sun4v-based platforms (Kvm)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL $(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/cfgadm \ @@ -482,16 +474,14 @@ $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/lib/cfgadm \ target=../../sun4u/lib/cfgadm $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/lib/fs \ target=../../sun4u/lib/fs -$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/sbin \ - target=../sun4u/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/sbin target=../sun4u/sbin $(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 \ target=../../sun4v/lib/libpcp.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,T5140/sbin \ - target=../sun4v/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,T5140/sbin target=../sun4v/sbin $(sparc_ONLY)link path=usr/platform/SUNW,T5240 target=SUNW,T5140 $(sparc_ONLY)link path=usr/platform/SUNW,T5440 target=SUNW,T5140 $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/fs \ @@ -500,8 +490,7 @@ $(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/sbin \ - target=../sun4v/sbin +$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/sbin target=../sun4v/sbin $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/lib/cfgadm \ target=../../sun4u/lib/cfgadm $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/lib/fs \ diff --git a/usr/src/pkg/manifests/system-library-policykit.mf b/usr/src/pkg/manifests/system-library-policykit.mf index c2cfab6f9c..b83a000699 100644 --- a/usr/src/pkg/manifests/system-library-policykit.mf +++ b/usr/src/pkg/manifests/system-library-policykit.mf @@ -39,11 +39,10 @@ file path=usr/lib/llib-lpolkit file path=usr/lib/llib-lpolkit.ln file path=usr/lib/pkgconfig/polkit.pc file path=usr/sbin/polkit-is-privileged mode=0555 -legacy pkg=SUNWpolkit arch=$(ARCH) category=system \ +legacy pkg=SUNWpolkit \ desc="Toolkit for controlling privileges (freedesktop.org)" \ - hotline="Please contact your local service provider" name=PolicyKit \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/hal/LICENSE license=cmd/hal/LICENSE + name=PolicyKit license cr_Sun license=cr_Sun +license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE link path=usr/lib/libpolkit.so target=./libpolkit.so.0.0.0 link path=usr/lib/libpolkit.so.0 target=./libpolkit.so.0.0.0 diff --git a/usr/src/pkg/manifests/system-library-processor.mf b/usr/src/pkg/manifests/system-library-processor.mf index 08dfaff2f0..5afd21c33c 100644 --- a/usr/src/pkg/manifests/system-library-processor.mf +++ b/usr/src/pkg/manifests/system-library-processor.mf @@ -95,31 +95,21 @@ $(sparc_ONLY)file path=platform/sun4v/lib/fs/ufs/bootblk group=sys mode=0444 \ reboot-needed=true $(sparc_ONLY)file path=platform/sun4v/lib/fs/zfs/bootblk group=sys mode=0444 \ reboot-needed=true -$(i386_ONLY)legacy pkg=SUNWcar.i arch=$(ARCH).i86pc category=system \ +$(i386_ONLY)legacy pkg=SUNWcar.i arch=$(ARCH).i86pc \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcar.u arch=$(ARCH).sun4u category=system \ + name="Core Architecture, (Root)" +$(sparc_ONLY)legacy pkg=SUNWcar.u arch=$(ARCH).sun4u \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcar.v arch=$(ARCH).sun4v category=system \ + name="Core Architecture, (Root)" +$(sparc_ONLY)legacy pkg=SUNWcar.v arch=$(ARCH).sun4v \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -$(sparc_ONLY)legacy pkg=SUNWcart200.v arch=$(ARCH).sun4v category=system \ + name="Core Architecture, (Root)" +$(sparc_ONLY)legacy pkg=SUNWcart200.v arch=$(ARCH).sun4v \ desc="core software for a specific hardware platform group" \ - hotline="Please contact your local service provider" \ - name="Core Architecture, sun4v-based platforms (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -$(i386_ONLY)legacy pkg=SUNWcarx.i arch=$(ARCH).i86pc category=system \ + name="Core Architecture, sun4v-based platforms (Root)" +$(i386_ONLY)legacy pkg=SUNWcarx.i arch=$(ARCH).i86pc \ desc="core software for the i86xpv virtual hardware platform" \ - hotline="Please contact your local service provider" \ - name="Core Architecture i86xpv, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Core Architecture i86xpv, (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL $(sparc_ONLY)link path=platform/SUNW,Netra-210 target=SUNW,Sun-Fire-V240 diff --git a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf index 663e337f1e..4ec9cdfeed 100644 --- a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf +++ b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf @@ -21,28 +21,28 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/system/library/security/crypto/pkcs11_kms@$(PKGVERS) -set name=pkg.description \ - value="PKCS#11 KMS Provider" -set name=pkg.summary value="pkcs11_kms" -set name=info.classification value=org.opensolaris.category.2010:System/Security/Crypto +set name=pkg.fmri \ + value=pkg:/system/library/security/crypto/pkcs11_kms@$(PKGVERS) +set name=pkg.description value="PKCS#11 KMS Provider" +set name=pkg.summary value=pkcs11_kms +set name=info.classification \ + value=org.opensolaris.category.2010:System/Security/Crypto 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 dir path=usr/lib/$(ARCH64) dir path=usr/lib/security dir path=usr/lib/security/$(ARCH64) -dir path=usr/bin -dir path=usr/share +file path=usr/bin/kmscfg group=sys mode=0555 file path=usr/lib/$(ARCH64)/libkmsagent.so.1 -file path=usr/lib/security/$(ARCH64)/pkcs11_kms.so.1 file path=usr/lib/libkmsagent.so.1 +file path=usr/lib/security/$(ARCH64)/pkcs11_kms.so.1 file path=usr/lib/security/pkcs11_kms.so.1 -file path=usr/bin/kmscfg group=sys mode=0555 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lib/libkmsagent/THIRDPARTYLICENSE \ - license=lib/libkmsagent/THIRDPARTYLICENSE +license usr/src/lib/libkmsagent/THIRDPARTYLICENSE \ + license=usr/src/lib/libkmsagent/THIRDPARTYLICENSE link path=usr/lib/security/$(ARCH64)/pkcs11_kms.so target=pkcs11_kms.so.1 link path=usr/lib/security/pkcs11_kms.so target=pkcs11_kms.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 7521386066..89d8231757 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 @@ -42,11 +42,9 @@ file path=usr/lib/$(ARCH64)/gss/mech_dh.so.1 file path=usr/lib/gss/dh1024-0.so.1 file path=usr/lib/gss/dh640-0.so.1 file path=usr/lib/gss/mech_dh.so.1 -legacy pkg=SUNWgssdh arch=$(ARCH) category=system \ +legacy pkg=SUNWgssdh \ desc="GSS-API mechanism libraries for NIS+ extended Diffie-Hellman" \ - hotline="Please contact your local service provider" \ - name="GSS Diffie-Hellman" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="GSS Diffie-Hellman" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/gss/dh1024-0.so target=dh1024-0.so.1 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 ec1b293b0d..65ba5bf35a 100644 --- a/usr/src/pkg/manifests/system-library-security-gss-spnego.mf +++ b/usr/src/pkg/manifests/system-library-security-gss-spnego.mf @@ -36,10 +36,7 @@ dir path=usr/lib/$(ARCH64)/gss dir path=usr/lib/gss file path=usr/lib/$(ARCH64)/gss/mech_spnego.so.1 file path=usr/lib/gss/mech_spnego.so.1 -legacy pkg=SUNWspnego arch=$(ARCH) category=system \ - desc="SPNEGO GSS-API Mechanism" \ - hotline="Please contact your local service provider" \ - name="SPNEGO GSS-API Mechanism" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWspnego desc="SPNEGO GSS-API Mechanism" \ + name="SPNEGO GSS-API Mechanism" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-library-security-gss.mf b/usr/src/pkg/manifests/system-library-security-gss.mf index af247359b8..a244408d30 100644 --- a/usr/src/pkg/manifests/system-library-security-gss.mf +++ b/usr/src/pkg/manifests/system-library-security-gss.mf @@ -45,15 +45,16 @@ file path=usr/lib/libgss.so.1 file path=usr/lib/sasl/$(ARCH64)/gssapi.so.1 file path=usr/lib/sasl/gssapi.so.1 file path=usr/sbin/gsscred group=sys mode=0555 -legacy pkg=SUNWgss arch=$(ARCH) category=system \ +legacy pkg=SUNWgss \ desc="Generic Security Service Application Program Interface, Version 2 - user" \ - hotline="Please contact your local service provider" name="GSSAPI V2" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="GSSAPI V2" license cr_Sun license=cr_Sun -license lib/libgss/THIRDPARTYLICENSE license=lib/libgss/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL -license lic_gss license=lic_gss -license uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \ - license=uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE +license usr/src/lib/libgss/THIRDPARTYLICENSE \ + license=usr/src/lib/libgss/THIRDPARTYLICENSE +license usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE \ + license=usr/src/lib/sasl_plugins/gssapi/THIRDPARTYLICENSE +license usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE \ + license=usr/src/uts/common/gssapi/mechs/krb5/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libgss.so target=libgss.so.1 link path=usr/lib/libgss.so target=libgss.so.1 diff --git a/usr/src/pkg/manifests/system-library-security-libsasl.mf b/usr/src/pkg/manifests/system-library-security-libsasl.mf index 4efc0ffcac..227cde611f 100644 --- a/usr/src/pkg/manifests/system-library-security-libsasl.mf +++ b/usr/src/pkg/manifests/system-library-security-libsasl.mf @@ -44,12 +44,11 @@ file path=usr/lib/sasl/$(ARCH64)/plain.so.1 file path=usr/lib/sasl/crammd5.so.1 file path=usr/lib/sasl/digestmd5.so.1 file path=usr/lib/sasl/plain.so.1 -legacy pkg=SUNWlibsasl arch=$(ARCH) category=system \ +legacy pkg=SUNWlibsasl \ desc="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" \ - hotline="Please contact your local service provider" \ - name="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Simple Authentication and Security Layer (SASL) v2 shared library and plugins" license cr_Sun license=cr_Sun -license lib/libsasl/THIRDPARTYLICENSE license=lib/libsasl/THIRDPARTYLICENSE +license usr/src/lib/libsasl/THIRDPARTYLICENSE \ + license=usr/src/lib/libsasl/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libsasl.so target=libsasl.so.1 link path=usr/lib/libsasl.so target=libsasl.so.1 diff --git a/usr/src/pkg/manifests/system-library-security-rpcsec.mf b/usr/src/pkg/manifests/system-library-security-rpcsec.mf index 178901a98a..231ab0d5de 100644 --- a/usr/src/pkg/manifests/system-library-security-rpcsec.mf +++ b/usr/src/pkg/manifests/system-library-security-rpcsec.mf @@ -34,10 +34,7 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) file path=usr/lib/$(ARCH64)/rpcsec.so.1 file path=usr/lib/rpcsec.so.1 -legacy pkg=SUNWrsg arch=$(ARCH) category=system \ - desc="GSS-API services for ONC RPC" \ - hotline="Please contact your local service provider" name=RPCSEC_GSS \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWrsg desc="GSS-API services for ONC RPC" name=RPCSEC_GSS license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/rpcsec.so target=rpcsec.so.1 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 f0dfd4d299..8bb5d84a74 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 @@ -40,19 +40,16 @@ file path=etc/hba.conf original_name=SUNWcfcl:etc/hba.conf preserve=true file path=usr/include/hbaapi.h file path=usr/lib/$(ARCH64)/libHBAAPI.so.1 file path=usr/lib/libHBAAPI.so.1 -legacy pkg=SUNWcfcl arch=$(ARCH) category=system \ +legacy pkg=SUNWcfcl \ desc="Common Fibre Channel HBA API Library based on the T11 FC-MI specification" \ - hotline="Please contact your local service provider" \ - name="Common Fibre Channel HBA API Library (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWcfclr arch=$(ARCH) category=system \ + name="Common Fibre Channel HBA API Library (Usr)" +legacy pkg=SUNWcfclr \ desc="Common Fibre Channel HBA API Library based on the T11 FC-MI specification" \ - hotline="Please contact your local service provider" \ - name="Common Fibre Channel HBA API Library (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Common Fibre Channel HBA API Library (Root)" license cr_Sun license=cr_Sun -license lib/hbaapi/THIRDPARTYLICENSE license=lib/hbaapi/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/hbaapi/THIRDPARTYLICENSE \ + license=usr/src/lib/hbaapi/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libHBAAPI.so target=libHBAAPI.so.1 link path=usr/lib/libHBAAPI.so target=libHBAAPI.so.1 depend fmri=system/library/storage/fibre-channel/libsun_fc type=require 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 dfb3b84f5f..bdb8dfe3f2 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 @@ -37,16 +37,11 @@ dir path=usr/lib dir path=usr/lib/$(ARCH64) file path=usr/lib/$(ARCH64)/libsun_fc.so.1 file path=usr/lib/libsun_fc.so.1 -legacy pkg=SUNWfchba arch=$(ARCH) category=system \ - desc="SNIA HBA library for Sun Fibre Channel adapters" \ - hotline="Please contact your local service provider" \ - name="Sun Fibre Channel Host Bus Adapter Library" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWfchbar arch=$(ARCH) category=system \ +legacy pkg=SUNWfchba desc="SNIA HBA library for Sun Fibre Channel adapters" \ + name="Sun Fibre Channel Host Bus Adapter Library" +legacy pkg=SUNWfchbar \ desc="T11 FC-HBA library for Sun Fibre Channel adapters (root)" \ - hotline="Please contact your local service provider" \ - name="Sun Fibre Channel Host Bus Adapter Library (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun Fibre Channel Host Bus Adapter Library (root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libsun_fc.so target=libsun_fc.so.1 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 53c7115bdc..ef956574eb 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 @@ -40,19 +40,16 @@ file path=usr/include/ima.h file path=usr/include/libsun_ima.h file path=usr/lib/$(ARCH64)/libima.so.1 file path=usr/lib/libima.so.1 -legacy pkg=SUNWimac arch=$(ARCH) category=system \ +legacy pkg=SUNWimac \ desc="SNIA iSCSI Managment API common library for iSCSI adapters" \ - hotline="Please contact your local service provider" \ - name="Solaris IMA Common Library" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWimacr arch=$(ARCH) category=system \ + name="Solaris IMA Common Library" +legacy pkg=SUNWimacr \ desc="SNIA iSCSI Managment API common library for iSCSI adapters (Root)" \ - hotline="Please contact your local service provider" \ - name="Solaris IMA Common Library (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Solaris IMA Common Library (Root)" license cr_Sun license=cr_Sun -license lib/libima/THIRDPARTYLICENSE license=lib/libima/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/libima/THIRDPARTYLICENSE \ + license=usr/src/lib/libima/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libima.so target=libima.so.1 link path=usr/lib/libima.so target=libima.so.1 depend fmri=system/library/storage/ima type=require diff --git a/usr/src/pkg/manifests/system-library-storage-ima.mf b/usr/src/pkg/manifests/system-library-storage-ima.mf index b06950ea9f..591688cb1c 100644 --- a/usr/src/pkg/manifests/system-library-storage-ima.mf +++ b/usr/src/pkg/manifests/system-library-storage-ima.mf @@ -42,18 +42,15 @@ file path=usr/lib/llib-lima file path=usr/lib/llib-lima.ln file path=usr/lib/llib-lsun_ima file path=usr/lib/llib-lsun_ima.ln -legacy pkg=SUNWima arch=$(ARCH) category=system \ +legacy pkg=SUNWima \ desc="SNIA iSCSI Managment API plugin library for iSCSI adapters" \ - hotline="Please contact your local service provider" \ - name="Solaris IMA Software Initiator Plugin" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWimar arch=$(ARCH) category=system \ + name="Solaris IMA Software Initiator Plugin" +legacy pkg=SUNWimar \ desc="SNIA iSCSI Managment API plugin library for iSCSI adapters (Root)" \ - hotline="Please contact your local service provider" \ - name="Solaris IMA Software Initiator Plugin (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Solaris IMA Software Initiator Plugin (Root)" license cr_Sun license=cr_Sun -license lib/libima/THIRDPARTYLICENSE license=lib/libima/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/libima/THIRDPARTYLICENSE \ + license=usr/src/lib/libima/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libsun_ima.so target=libsun_ima.so.1 link path=usr/lib/libsun_ima.so target=libsun_ima.so.1 diff --git a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf index 4edcc7b263..d484113e81 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpapi.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpapi.mf @@ -43,20 +43,15 @@ 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 \ - desc="Common Library based on SNIA MP API specification" \ - hotline="Please contact your local service provider" \ - name="SNIA Multipath Management API Common Library" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWmpapir arch=$(ARCH) category=system \ +legacy pkg=SUNWmpapi desc="Common Library based on SNIA MP API specification" \ + name="SNIA Multipath Management API Common Library" +legacy pkg=SUNWmpapir \ desc="Common Library based on SNIA MP API specification (Root)" \ - hotline="Please contact your local service provider" \ - name="SNIA Multipath Management API Common Library (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="SNIA Multipath Management API Common Library (Root)" license cr_Sun license=cr_Sun -license lib/mpapi/libmpapi/THIRDPARTYLICENSE \ - license=lib/mpapi/libmpapi/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE \ + license=usr/src/lib/mpapi/libmpapi/THIRDPARTYLICENSE 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 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 21bbde5b58..5339829737 100644 --- a/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf +++ b/usr/src/pkg/manifests/system-library-storage-libmpscsi_vhci.mf @@ -41,11 +41,9 @@ dir path=lib dir path=lib/$(ARCH64) file path=lib/$(ARCH64)/libmpscsi_vhci.so.1 file path=lib/libmpscsi_vhci.so.1 -legacy pkg=SUNWmpsvplr arch=$(ARCH) category=system \ +legacy pkg=SUNWmpsvplr \ desc="SNIA MP API plugin library for the scsi_vhci driver (Root)" \ - hotline="Please contact your local service provider" \ - name="Sun MP API library for the scsi_vhci driver (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun MP API library for the scsi_vhci driver (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=lib/$(ARCH64)/libmpscsi_vhci.so target=libmpscsi_vhci.so.1 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 0cb5ed4492..11d83967b0 100644 --- a/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf +++ b/usr/src/pkg/manifests/system-library-storage-scsi-plugins.mf @@ -44,11 +44,8 @@ file path=usr/lib/scsi/plugins/ses/vendor/LSILOGIC-SASX28-A.0.so file path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4400.so file path=usr/lib/scsi/plugins/ses/vendor/SUN-Storage-J4500.so file path=usr/lib/scsi/plugins/ses/vendor/SUN.so -legacy pkg=SUNWscsip arch=$(ARCH) category=system \ - desc="Vendor specific SCSI and SES plugins" \ - hotline="Please contact your local service provider" \ - name="SCSI/SES plugins" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWscsip desc="Vendor specific SCSI and SES plugins" \ + name="SCSI/SES plugins" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/scsi/plugins/ses/vendor/$(ARCH64)/LSILOGIC-SASX28-A.1.so \ diff --git a/usr/src/pkg/manifests/system-library-svm-rcm.mf b/usr/src/pkg/manifests/system-library-svm-rcm.mf index 44d9503885..6d7ad27573 100644 --- a/usr/src/pkg/manifests/system-library-svm-rcm.mf +++ b/usr/src/pkg/manifests/system-library-svm-rcm.mf @@ -35,10 +35,7 @@ dir path=usr/lib dir path=usr/lib/rcm 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 +legacy pkg=SUNWmddr desc="reconfiguration coordination manager module for SVM" \ + name="SVM RCM Module" 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 dba34bfe6f..829dff9a04 100644 --- a/usr/src/pkg/manifests/system-library.mf +++ b/usr/src/pkg/manifests/system-library.mf @@ -54,9 +54,9 @@ dir path=usr/lib/iconv/$(ARCH64) $(i386_ONLY)dir path=usr/lib/libc dir path=usr/lib/lwp dir path=usr/lib/lwp/$(ARCH64) -dir path=usr/lib/python2.4 -dir path=usr/lib/python2.4/vendor-packages -dir path=usr/lib/python2.4/vendor-packages/solaris +dir path=usr/lib/python2.6 +dir path=usr/lib/python2.6/vendor-packages +dir path=usr/lib/python2.6/vendor-packages/solaris dir path=usr/lib/raidcfg dir path=usr/lib/raidcfg/$(ARCH64) dir path=usr/lib/scsi @@ -365,9 +365,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/__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/python2.6/vendor-packages/solaris/__init__.py +file path=usr/lib/python2.6/vendor-packages/solaris/__init__.pyc +file path=usr/lib/python2.6/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 @@ -447,58 +447,68 @@ file path=usr/xpg4/lib/$(ARCH64)/libcurses.so.1 file path=usr/xpg4/lib/$(ARCH64)/libcurses.so.2 file path=usr/xpg4/lib/libcurses.so.1 file path=usr/xpg4/lib/libcurses.so.2 -legacy pkg=SUNWcsl arch=$(ARCH) category=system \ +legacy pkg=SUNWcsl \ desc="core shared libraries for a specific instruction-set architecture" \ - hotline="Please contact your local service provider" \ - name="Core Solaris, (Shared Libs)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWcslr arch=$(ARCH) category=system \ + name="Core Solaris, (Shared Libs)" +legacy pkg=SUNWcslr \ desc="core software for a specific instruction-set architecture" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Libraries (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license common/crypto/THIRDPARTYLICENSE.cryptogams \ - license=common/crypto/THIRDPARTYLICENSE.cryptogams -license common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \ - license=common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman -license common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \ - license=common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl -license common/crypto/ecc/THIRDPARTYLICENSE \ - license=common/crypto/ecc/THIRDPARTYLICENSE -license common/crypto/md5/amd64/THIRDPARTYLICENSE \ - license=common/crypto/md5/amd64/THIRDPARTYLICENSE -license common/mpi/THIRDPARTYLICENSE license=common/mpi/THIRDPARTYLICENSE + name="Core Solaris Libraries (Root)" license cr_Sun license=cr_Sun -license lib/libast/THIRDPARTYLICENSE license=lib/libast/THIRDPARTYLICENSE -license lib/libbsdmalloc/THIRDPARTYLICENSE \ - license=lib/libbsdmalloc/THIRDPARTYLICENSE -license lib/libcmd/THIRDPARTYLICENSE license=lib/libcmd/THIRDPARTYLICENSE -license lib/libdll/THIRDPARTYLICENSE license=lib/libdll/THIRDPARTYLICENSE -license lib/libinetutil/common/THIRDPARTYLICENSE \ - license=lib/libinetutil/common/THIRDPARTYLICENSE -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/libresolv2/THIRDPARTYLICENSE \ - license=lib/libresolv2/THIRDPARTYLICENSE -license lib/libshell/THIRDPARTYLICENSE license=lib/libshell/THIRDPARTYLICENSE -license lib/libsum/THIRDPARTYLICENSE license=lib/libsum/THIRDPARTYLICENSE -license lib/libwrap/THIRDPARTYLICENSE license=lib/libwrap/THIRDPARTYLICENSE -license lib/pam_modules/authtok_check/THIRDPARTYLICENSE \ - license=lib/pam_modules/authtok_check/THIRDPARTYLICENSE -license lib/passwdutil/THIRDPARTYLICENSE \ - license=lib/passwdutil/THIRDPARTYLICENSE -license lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE \ - license=lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE -license lic_AMD license=lic_AMD license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble -license uts/common/sys/THIRDPARTYLICENSE.unicode \ - license=uts/common/sys/THIRDPARTYLICENSE.unicode +license usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams \ + license=usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams +license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \ + license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman +license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \ + license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl +license usr/src/common/crypto/ecc/THIRDPARTYLICENSE \ + license=usr/src/common/crypto/ecc/THIRDPARTYLICENSE +license usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE \ + license=usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE +license usr/src/common/mpi/THIRDPARTYLICENSE \ + license=usr/src/common/mpi/THIRDPARTYLICENSE +license usr/src/lib/libast/THIRDPARTYLICENSE \ + license=usr/src/lib/libast/THIRDPARTYLICENSE +license usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE \ + license=usr/src/lib/libbsdmalloc/THIRDPARTYLICENSE +$(i386_ONLY)license usr/src/lib/libc/$(ARCH64)/gen/THIRDPARTYLICENSE \ + license=usr/src/lib/libc/$(ARCH64)/gen/THIRDPARTYLICENSE +license usr/src/lib/libc/port/fp/THIRDPARTYLICENSE \ + license=usr/src/lib/libc/port/fp/THIRDPARTYLICENSE +license usr/src/lib/libcmd/THIRDPARTYLICENSE \ + license=usr/src/lib/libcmd/THIRDPARTYLICENSE +license usr/src/lib/libdll/THIRDPARTYLICENSE \ + license=usr/src/lib/libdll/THIRDPARTYLICENSE +license usr/src/lib/libinetutil/common/THIRDPARTYLICENSE \ + license=usr/src/lib/libinetutil/common/THIRDPARTYLICENSE +license usr/src/lib/libkmf/THIRDPARTYLICENSE \ + license=usr/src/lib/libkmf/THIRDPARTYLICENSE +license usr/src/lib/libldap4/THIRDPARTYLICENSE \ + license=usr/src/lib/libldap4/THIRDPARTYLICENSE +license usr/src/lib/libldap5/THIRDPARTYLICENSE \ + license=usr/src/lib/libldap5/THIRDPARTYLICENSE +license usr/src/lib/libmp/common/THIRDPARTYLICENSE \ + license=usr/src/lib/libmp/common/THIRDPARTYLICENSE +license usr/src/lib/libresolv/THIRDPARTYLICENSE \ + license=usr/src/lib/libresolv/THIRDPARTYLICENSE +license usr/src/lib/libresolv2/THIRDPARTYLICENSE \ + license=usr/src/lib/libresolv2/THIRDPARTYLICENSE +license usr/src/lib/libshell/THIRDPARTYLICENSE \ + license=usr/src/lib/libshell/THIRDPARTYLICENSE +license usr/src/lib/libsum/THIRDPARTYLICENSE \ + license=usr/src/lib/libsum/THIRDPARTYLICENSE +license usr/src/lib/libwrap/THIRDPARTYLICENSE \ + license=usr/src/lib/libwrap/THIRDPARTYLICENSE +license usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE \ + license=usr/src/lib/pam_modules/authtok_check/THIRDPARTYLICENSE +license usr/src/lib/passwdutil/THIRDPARTYLICENSE \ + license=usr/src/lib/passwdutil/THIRDPARTYLICENSE +license usr/src/lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE \ + license=usr/src/lib/pkcs11/pkcs11_tpm/THIRDPARTYLICENSE +license usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode \ + license=usr/src/uts/common/sys/THIRDPARTYLICENSE.unicode link path=lib/$(ARCH64)/libadm.so target=libadm.so.1 link path=lib/$(ARCH64)/libaio.so target=libaio.so.1 link path=lib/$(ARCH64)/libbsm.so target=libbsm.so.1 @@ -1199,6 +1209,7 @@ link path=usr/xpg4/lib/$(ARCH64)/libcurses.so target=libcurses.so.2 link path=usr/xpg4/lib/64 target=$(ARCH64) link path=usr/xpg4/lib/libcurses.so target=./libcurses.so.2 $(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require +depend fmri=runtime/python-26 type=require # # libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/, # a dependency which cannot be automatically derived diff --git a/usr/src/pkg/manifests/system-management-intel-amt.mf b/usr/src/pkg/manifests/system-management-intel-amt.mf index a2b65f5c0c..315a8dc2d3 100644 --- a/usr/src/pkg/manifests/system-management-intel-amt.mf +++ b/usr/src/pkg/manifests/system-management-intel-amt.mf @@ -60,15 +60,15 @@ 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 -legacy pkg=SUNWamt arch=$(ARCH) category=system \ +legacy pkg=SUNWamt \ desc="Solaris support for Intel Active Management Technology" \ - hotline="Please contact your local service provider" \ - name="Solaris support for Intel AMT" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWamt-lms arch=$(ARCH) category=system \ + name="Solaris support for Intel AMT" +legacy pkg=SUNWamt-lms \ desc="Solaris support for Intel Active Management Technology - LMS daemon" \ - hotline="Please contact your local service provider" \ - name="Solaris support for Intel AMT - LMS daemon" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Solaris support for Intel AMT - LMS daemon" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/lms/THIRDPARTYLICENSE \ + license=usr/src/cmd/lms/THIRDPARTYLICENSE +license usr/src/uts/intel/io/heci/THIRDPARTYLICENSE \ + license=usr/src/uts/intel/io/heci/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/system-management-pcitool.mf b/usr/src/pkg/manifests/system-management-pcitool.mf index 271750fece..cfafa2b001 100644 --- a/usr/src/pkg/manifests/system-management-pcitool.mf +++ b/usr/src/pkg/manifests/system-management-pcitool.mf @@ -40,10 +40,8 @@ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/sbin file path=usr/sbin/pcitool mode=0555 -legacy pkg=SUNWio-tools arch=$(ARCH) category=system \ +legacy pkg=SUNWio-tools \ desc="Administrative tools to modify the pci/pcie fabric" \ - hotline="Please contact your local service provider" \ - name="Administrative tools to modify the pci/pcie fabric" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Administrative tools to modify the pci/pcie fabric" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 bd56804d7e..c31774d62e 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 @@ -63,11 +63,9 @@ file path=lib/svc/manifest/application/management/snmpdx.xml group=sys \ 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 -legacy pkg=SUNWsacom arch=$(ARCH) category=system \ +legacy pkg=SUNWsacom \ desc="Solstice Enterprise Agents 1.0.3 files for root file system" \ - hotline="Please contact your local service provider" \ - name="Solstice Enterprise Agents 1.0.3 files for root file system" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Solstice Enterprise Agents 1.0.3 files for root file system" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL license lic_OSBL license=lic_OSBL diff --git a/usr/src/pkg/manifests/system-management-snmp-sea.mf b/usr/src/pkg/manifests/system-management-snmp-sea.mf index cddd8eaa47..d51747b477 100644 --- a/usr/src/pkg/manifests/system-management-snmp-sea.mf +++ b/usr/src/pkg/manifests/system-management-snmp-sea.mf @@ -42,15 +42,13 @@ file path=usr/lib/libssagent.so.1 file path=usr/lib/libssasnmp.so.1 file path=usr/lib/snmp/snmpdx group=sys mode=0755 file path=usr/sbin/snmp_trapsend mode=0755 -legacy pkg=SUNWsasnm arch=$(ARCH) category=system \ +legacy pkg=SUNWsasnm \ desc="Solstice Enterprise Agents 1.0.3 Simple Network Management Protocol" \ - hotline="Please contact your local service provider" \ - name="Solstice Enterprise Agents 1.0.3 Simple Network Management Protocol" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/agents/snmp/THIRDPARTYLICENSE \ - license=cmd/agents/snmp/THIRDPARTYLICENSE + name="Solstice Enterprise Agents 1.0.3 Simple Network Management Protocol" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/agents/snmp/THIRDPARTYLICENSE \ + license=usr/src/cmd/agents/snmp/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libssagent.so target=./libssagent.so.1 link path=usr/lib/$(ARCH64)/libssasnmp.so target=./libssasnmp.so.1 link path=usr/lib/libssagent.so target=./libssagent.so.1 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 441e534b32..da59020572 100644 --- a/usr/src/pkg/manifests/system-management-wbem-data-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-data-management.mf @@ -34,16 +34,10 @@ dir path=usr/lib file path=usr/lib/libfsmgt.so.1 file path=usr/lib/llib-lfsmgt file path=usr/lib/llib-lfsmgt.ln -legacy pkg=SUNWdmgtr arch=$(ARCH) category=system \ - desc="software for WBEM/CIM data device management" \ - hotline="Please contact your local service provider" \ - name="Solaris Data Management WBEM/CIM API (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWdmgtu arch=$(ARCH) category=system \ - desc="software for WBEM/CIM data device management" \ - hotline="Please contact your local service provider" \ - name="Solaris Data Management WBEM/CIM API (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWdmgtr desc="software for WBEM/CIM data device management" \ + name="Solaris Data Management WBEM/CIM API (root)" +legacy pkg=SUNWdmgtu desc="software for WBEM/CIM data device management" \ + name="Solaris Data Management WBEM/CIM API (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libfsmgt.so target=./libfsmgt.so.1 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 a0afc2e768..690409c2fa 100644 --- a/usr/src/pkg/manifests/system-management-wbem-resource-management.mf +++ b/usr/src/pkg/manifests/system-management-wbem-resource-management.mf @@ -29,5 +29,5 @@ # set name=pkg.fmri \ value=pkg:/system/management/wbem/resource-management@$(PKGVERS) -set name=pkg.obsolete value=true +set name=pkg.obsolete value=true set name=variant.arch value=$(ARCH) diff --git a/usr/src/pkg/manifests/system-network-console.mf b/usr/src/pkg/manifests/system-network-console.mf index 0cce70fff2..b9db94a1a0 100644 --- a/usr/src/pkg/manifests/system-network-console.mf +++ b/usr/src/pkg/manifests/system-network-console.mf @@ -67,14 +67,9 @@ 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 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 -legacy pkg=SUNWcvcr.u arch=$(ARCH).sun4u category=system \ - desc="Network Console daemon" \ - hotline="Please contact your local service provider" \ - name="Network Console daemon" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWcvc.u arch=$(ARCH).sun4u desc="Network Console" \ + name="Network Console" +legacy pkg=SUNWcvcr.u arch=$(ARCH).sun4u desc="Network Console daemon" \ + name="Network Console daemon" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 ee59bff686..2d5821cc72 100644 --- a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf +++ b/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf @@ -42,6 +42,7 @@ 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=etc/sock2path.d group=sys dir path=kernel group=sys dir path=kernel/drv group=sys dir path=kernel/drv/$(ARCH64) group=sys @@ -65,6 +66,8 @@ 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=etc/sock2path.d/system%2Fnetwork%2Fhttp%2Fcache%2Faccelerator \ + group=sys 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 @@ -80,16 +83,12 @@ 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 \ +legacy pkg=SUNWncar \ desc="core components to enable the network cache and accelerator" \ - hotline="Please contact your local service provider" \ - name="Solaris Network Cache and Accelerator (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWncau arch=$(ARCH) category=system \ + name="Solaris Network Cache and Accelerator (Root)" +legacy pkg=SUNWncau \ desc="components to enable the network cache and accelerator" \ - hotline="Please contact your local service provider" \ - name="Solaris Network Cache and Accelerator (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Solaris Network Cache and Accelerator (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/ncad_addr.so target=./ncad_addr.so.1 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 6042ecedf6..84336ec97a 100644 --- a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf +++ b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf @@ -52,10 +52,7 @@ $(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 +legacy pkg=SUNWqos desc="Solaris IP Quality of Service (Root)" \ + name="IP QoS, (Root)" 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 e1b6c7319d..5fb4af01bb 100644 --- a/usr/src/pkg/manifests/system-network-ipqos.mf +++ b/usr/src/pkg/manifests/system-network-ipqos.mf @@ -55,9 +55,7 @@ file path=usr/lib/ipqosconf/ipgpc.types mode=0444 file path=usr/lib/ipqosconf/tokenmt.types mode=0444 file path=usr/lib/ipqosconf/tswtclmt.types mode=0444 file path=usr/sbin/ipqosconf mode=0755 -legacy pkg=SUNWqosu arch=$(ARCH) category=system \ - desc="Solaris IP Quality of Service (Usr)" \ - hotline="Please contact your local service provider" name="IP QoS, (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWqosu desc="Solaris IP Quality of Service (Usr)" \ + name="IP QoS, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-network-nis.mf b/usr/src/pkg/manifests/system-network-nis.mf index 6841612ec1..1563d41e52 100644 --- a/usr/src/pkg/manifests/system-network-nis.mf +++ b/usr/src/pkg/manifests/system-network-nis.mf @@ -80,16 +80,11 @@ 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 -legacy pkg=SUNWnisr arch=$(ARCH) category=system \ +legacy pkg=SUNWnisr \ desc="configuration files and directories for the Network Information System (NIS)" \ - hotline="Please contact your local service provider" \ - name="Network Information System, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWnisu arch=$(ARCH) category=system \ - desc="utilities for the Network Information System (NIS)" \ - hotline="Please contact your local service provider" \ - name="Network Information System, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Network Information System, (Root)" +legacy pkg=SUNWnisu desc="utilities for the Network Information System (NIS)" \ + name="Network Information System, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/libnisdb.so target=./libnisdb.so.2 diff --git a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf index 5af0ee6fca..d87aa4c18b 100644 --- a/usr/src/pkg/manifests/system-network-ppp-pppdump.mf +++ b/usr/src/pkg/manifests/system-network-ppp-pppdump.mf @@ -41,15 +41,12 @@ file path=usr/bin/pppdump mode=0555 file path=usr/lib/inet/ppp/minconn.so mode=0544 file path=usr/lib/inet/ppp/passprompt.so mode=0544 file path=usr/share/man/man1m/pppdump.1m -legacy pkg=SUNWpppg arch=$(ARCH) category=system \ - desc="Optional GNU utilities for use with PPP" \ - hotline="Please contact your local service provider" \ - name="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 \ - license=cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd -license cmd/cmd-inet/usr.bin/pppdump/LICENSE.top \ - license=cmd/cmd-inet/usr.bin/pppdump/LICENSE.top +legacy pkg=SUNWpppg desc="Optional GNU utilities for use with PPP" \ + name="GNU utilities for PPP" license cr_Sun license=cr_Sun +license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect \ + license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.minconnect +license usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd \ + license=usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/THIRDPARTYLICENSE.passwd +license usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/system-network-ppp-tunnel.mf b/usr/src/pkg/manifests/system-network-ppp-tunnel.mf index bf0358c3e6..68f82a8012 100644 --- a/usr/src/pkg/manifests/system-network-ppp-tunnel.mf +++ b/usr/src/pkg/manifests/system-network-ppp-tunnel.mf @@ -38,10 +38,7 @@ file path=usr/lib/inet/ppp/pppoe.so mode=0544 file path=usr/lib/inet/pppoec mode=0555 file path=usr/lib/inet/pppoed mode=0555 file path=usr/sbin/sppptun mode=0555 -legacy pkg=SUNWpppdt arch=$(ARCH) category=system \ - desc="Extensions implementing PPP tunneling protocols" \ - hotline="Please contact your local service provider" \ - name="Solaris PPP Tunneling" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWpppdt desc="Extensions implementing PPP tunneling protocols" \ + name="Solaris PPP Tunneling" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-network-ppp.mf b/usr/src/pkg/manifests/system-network-ppp.mf index fe7fec0eb1..e768b7ddd7 100644 --- a/usr/src/pkg/manifests/system-network-ppp.mf +++ b/usr/src/pkg/manifests/system-network-ppp.mf @@ -80,24 +80,18 @@ hardlink path=etc/rcS.d/K50pppd target=../../etc/init.d/pppd hardlink path=usr/kernel/strmod/$(ARCH64)/sppptun \ target=../../drv/$(ARCH64)/sppptun $(i386_ONLY)hardlink path=usr/kernel/strmod/sppptun target=../drv/sppptun -legacy pkg=SUNWpppd arch=$(ARCH) category=system \ +legacy pkg=SUNWpppd \ desc="Device drivers implementing point-to-point protocol (PPP)" \ - hotline="Please contact your local service provider" \ - name="Solaris PPP Device Drivers" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWpppdr arch=$(ARCH) category=system \ + name="Solaris PPP Device Drivers" +legacy pkg=SUNWpppdr \ desc="Configuration files for Solaris Point-to-Point Protocol (PPP)" \ - hotline="Please contact your local service provider" \ - name="Solaris PPP configuration files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWpppdu arch=$(ARCH) category=system \ + name="Solaris PPP configuration files" +legacy pkg=SUNWpppdu \ desc="Daemon and utilities for Point-to-Point Protocol (PPP)" \ - hotline="Please contact your local service provider" \ - name="Solaris PPP daemon and utilities" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE + name="Solaris PPP daemon and utilities" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license uts/common/io/ppp/THIRDPARTYLICENSE \ - license=uts/common/io/ppp/THIRDPARTYLICENSE +license usr/src/cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.bin/pppd/THIRDPARTYLICENSE +license usr/src/uts/common/io/ppp/THIRDPARTYLICENSE \ + license=usr/src/uts/common/io/ppp/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/system-network-routing-vrrp.mf b/usr/src/pkg/manifests/system-network-routing-vrrp.mf index 10db36941a..2c9c18f342 100644 --- a/usr/src/pkg/manifests/system-network-routing-vrrp.mf +++ b/usr/src/pkg/manifests/system-network-routing-vrrp.mf @@ -48,15 +48,9 @@ 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 -legacy pkg=SUNWvrrpr arch=$(ARCH) category=system \ - desc="Solaris VRRP Administration" \ - hotline="Please contact your local service provider" \ - name="Solaris VRRP protocol (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWvrrpu arch=$(ARCH) category=system \ - desc="Solaris VRRP Administration" \ - hotline="Please contact your local service provider" \ - name="Solaris VRRP protocol (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWvrrpr desc="Solaris VRRP Administration" \ + name="Solaris VRRP protocol (Root)" +legacy pkg=SUNWvrrpu desc="Solaris VRRP Administration" \ + name="Solaris VRRP protocol (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-network-routing.mf b/usr/src/pkg/manifests/system-network-routing.mf index acd82070b1..554d9496e0 100644 --- a/usr/src/pkg/manifests/system-network-routing.mf +++ b/usr/src/pkg/manifests/system-network-routing.mf @@ -51,20 +51,15 @@ 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 -legacy pkg=SUNWroute arch=$(ARCH) category=system \ - desc="Network Routing daemons/commands (Usr)" \ - hotline="Please contact your local service provider" \ - name="Network Routing daemons/commands (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWroutr arch=$(ARCH) category=system \ - desc="Network Routing daemons/commands (Root)" \ - hotline="Please contact your local service provider" \ - name="Network Routing daemons/commands (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -license cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE -license cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE \ - license=cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE +legacy pkg=SUNWroute desc="Network Routing daemons/commands (Usr)" \ + name="Network Routing daemons/commands (Usr)" +legacy pkg=SUNWroutr desc="Network Routing daemons/commands (Root)" \ + name="Network Routing daemons/commands (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -license lic_SUNWroute license=lic_SUNWroute +license usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE \ + license=usr/src/cmd/cmd-inet/usr.sbin/in.rdisc/THIRDPARTYLICENSE +license usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd \ + license=usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd +license usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd \ + license=usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd diff --git a/usr/src/pkg/manifests/system-network-spdadm.mf b/usr/src/pkg/manifests/system-network-spdadm.mf index 8ebdb1853a..ccfbbf1872 100644 --- a/usr/src/pkg/manifests/system-network-spdadm.mf +++ b/usr/src/pkg/manifests/system-network-spdadm.mf @@ -43,10 +43,7 @@ dir path=usr/lib/rcm/scripts dir path=usr/sbin file path=usr/lib/rcm/scripts/SUNW,ibsdpu.sh mode=0555 file path=usr/sbin/sdpadm mode=0555 -legacy pkg=SUNWibsdpu arch=$(ARCH) category=system \ - desc="Sun InfiniBand Sockets Direct Protocol Admin" \ - hotline="Please contact your local service provider" \ - name="Sun InfiniBand pseudo Sockets Direct Protocol Admin" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWibsdpu desc="Sun InfiniBand Sockets Direct Protocol Admin" \ + name="Sun InfiniBand pseudo Sockets Direct Protocol Admin" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 ea1964cf4d..db151bca78 100644 --- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf +++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf @@ -57,16 +57,11 @@ 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 \ target=../../etc/init.d/dodatadm.udaplt -legacy pkg=SUNWudapltr arch=$(ARCH) category=system \ +legacy pkg=SUNWudapltr \ desc="Sun uDAPL provider for Tavor driver and registration script" \ - hotline="Please contact your local service provider" \ - name="Sun uDAPL for Tavor (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWudapltu arch=$(ARCH) category=system \ - desc="Sun uDAPL provider for Tavor" \ - hotline="Please contact your local service provider" \ - name="Sun uDAPL for Tavor (User)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="Sun uDAPL for Tavor (Root)" +legacy pkg=SUNWudapltu desc="Sun uDAPL provider for Tavor" \ + name="Sun uDAPL for Tavor (User)" license cr_Sun license=cr_Sun license lic_OSBL license=lic_OSBL license lic_OSBL_preamble license=lic_OSBL_preamble diff --git a/usr/src/pkg/manifests/system-network-udapl.mf b/usr/src/pkg/manifests/system-network-udapl.mf index 39a3a3f559..70213924f5 100644 --- a/usr/src/pkg/manifests/system-network-udapl.mf +++ b/usr/src/pkg/manifests/system-network-udapl.mf @@ -49,16 +49,10 @@ file path=usr/lib/libdat.so.1 file path=usr/lib/llib-ldat file path=usr/lib/llib-ldat.ln file path=usr/sbin/datadm mode=0555 -legacy pkg=SUNWudaplr arch=$(ARCH) category=system \ - desc="DAT static registry file" \ - hotline="Please contact your local service provider" \ - name="Sun User Direct Access Programming Library (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWudaplu arch=$(ARCH) category=system \ - desc="Sun DAT registry library and datadm" \ - hotline="Please contact your local service provider" \ - name="Sun User Direct Access Programming Library (User)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWudaplr desc="DAT static registry file" \ + name="Sun User Direct Access Programming Library (Root)" +legacy pkg=SUNWudaplu desc="Sun DAT registry library and datadm" \ + name="Sun User Direct Access Programming Library (User)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libdat.so target=libdat.so.1 diff --git a/usr/src/pkg/manifests/system-network-wificonfig.mf b/usr/src/pkg/manifests/system-network-wificonfig.mf index de21ca4886..4837735a6f 100644 --- a/usr/src/pkg/manifests/system-network-wificonfig.mf +++ b/usr/src/pkg/manifests/system-network-wificonfig.mf @@ -33,15 +33,8 @@ dir path=sbin group=sys dir path=usr group=sys dir path=usr/sbin file path=sbin/wificonfig mode=4755 -legacy pkg=SUNWwlanr arch=$(ARCH) category=system \ - desc="wifi config tool binaries" \ - hotline="Please contact your local service provider" \ - name="wifi config tool" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWwlanu arch=$(ARCH) category=system desc="wifi config tool" \ - hotline="Please contact your local service provider" \ - name="wifi config tool" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWwlanr desc="wifi config tool binaries" name="wifi config tool" +legacy pkg=SUNWwlanu desc="wifi config tool" name="wifi config tool" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/sbin/wificonfig target=../../sbin/wificonfig diff --git a/usr/src/pkg/manifests/system-network.mf b/usr/src/pkg/manifests/system-network.mf index c43a41fc96..7bd12d57b6 100644 --- a/usr/src/pkg/manifests/system-network.mf +++ b/usr/src/pkg/manifests/system-network.mf @@ -67,8 +67,6 @@ file path=etc/inet/ipsecinit.sample group=sys mode=0444 file path=etc/inet/secret/ike.preshared group=sys mode=0600 \ original_name=SUNWcnetr:etc/inet/secret/ike.preshared preserve=true file path=etc/inet/secret/ipseckeys.sample group=sys mode=0600 -file path=etc/inet/sock2path group=sys \ - original_name=SUNWcnetr:etc/inet/sock2path preserve=renameold file path=etc/ipadm/ipadm.conf group=netadm owner=netadm preserve=true file path=etc/nwam/loc/NoNet/ipf.conf.dfl group=netadm owner=netadm \ preserve=true @@ -83,14 +81,11 @@ file path=sbin/flowadm mode=0555 file path=sbin/flowstat mode=0555 file path=sbin/ipadm mode=0555 group groupname=netadm gid=65 -legacy pkg=SUNWcnetr arch=$(ARCH) category=system \ +legacy pkg=SUNWcnetr \ desc="core software for network infrastructure configuration" \ - hotline="Please contact your local service provider" \ - name="Core Solaris Network Infrastructure (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Core Solaris Network Infrastructure (Root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -link path=etc/sock2path target=./inet/sock2path user username=dladm ftpuser=false gcos-field="Datalink Admin" group=netadm \ uid=15 user username=netadm ftpuser=false gcos-field="Network Admin" group=netadm \ diff --git a/usr/src/pkg/manifests/system-remote-shared-memory.mf b/usr/src/pkg/manifests/system-remote-shared-memory.mf index db17605bcd..4ab61d6b38 100644 --- a/usr/src/pkg/manifests/system-remote-shared-memory.mf +++ b/usr/src/pkg/manifests/system-remote-shared-memory.mf @@ -40,11 +40,8 @@ $(i386_ONLY)file path=usr/kernel/drv/rsm group=sys file path=usr/kernel/drv/rsm.conf group=sys file path=usr/lib/$(ARCH64)/librsm.so.2 file path=usr/lib/librsm.so.2 -legacy pkg=SUNWrsm arch=$(ARCH) category=system \ - desc="Remote Shared Memory API Library, Driver" \ - hotline="Please contact your local service provider" \ - name="Remote Shared Memory" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWrsm desc="Remote Shared Memory API Library, Driver" \ + name="Remote Shared Memory" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/librsm.so target=librsm.so.2 diff --git a/usr/src/pkg/manifests/system-scheduler-fss.mf b/usr/src/pkg/manifests/system-scheduler-fss.mf index 6a2ed024f6..467ad3717b 100644 --- a/usr/src/pkg/manifests/system-scheduler-fss.mf +++ b/usr/src/pkg/manifests/system-scheduler-fss.mf @@ -39,10 +39,7 @@ file path=usr/kernel/sched/$(ARCH64)/FSS group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/sched/FSS group=sys mode=0755 file path=usr/lib/class/FSS/FSSdispadmin mode=0555 file path=usr/lib/class/FSS/FSSpriocntl mode=0555 -legacy pkg=SUNWfss arch=$(ARCH) category=system \ - desc="core software for the fair share scheduler" \ - hotline="Please contact your local service provider" \ - name="Fair Share Scheduler" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWfss desc="core software for the fair share scheduler" \ + name="Fair Share Scheduler" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-security-kerberos-5.mf b/usr/src/pkg/manifests/system-security-kerberos-5.mf index aa6b0ba1d1..df7c89035d 100644 --- a/usr/src/pkg/manifests/system-security-kerberos-5.mf +++ b/usr/src/pkg/manifests/system-security-kerberos-5.mf @@ -92,18 +92,14 @@ 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 -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." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWkdcu arch=$(ARCH) category=system \ - desc=" Kerberos V5 Master KDC (user)" \ - hotline="Please contact your local service provider" \ - name="Kerberos V5 Master KDC (user)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWkdcr desc="Kerberos V5 KDC (root)" \ + name="Kerberos V5 KDC (root)" +legacy pkg=SUNWkdcu desc=" Kerberos V5 Master KDC (user)" \ + name="Kerberos V5 Master KDC (user)" license cr_Sun license=cr_Sun -license lib/krb5/THIRDPARTYLICENSE license=lib/krb5/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/krb5/THIRDPARTYLICENSE \ + license=usr/src/lib/krb5/THIRDPARTYLICENSE link path=usr/lib/krb5/db2.so target=db2.so.1 link path=usr/lib/krb5/kldap.so target=kldap.so.1 link path=usr/lib/krb5/libdb2.so target=libdb2.so.1 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 b8891038aa..e5bc23f064 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 @@ -49,16 +49,11 @@ 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 hardlink path=usr/sbin/fcadm target=../../usr/sbin/fcinfo -legacy pkg=SUNWfcprt arch=$(ARCH) category=system \ - desc="Utility for Fibre Channel Host Bus Adapters" \ - hotline="Please contact your local service provider" \ - name="Fibre Channel HBA Port utility" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWfcprtr arch=$(ARCH) category=system \ +legacy pkg=SUNWfcprt desc="Utility for Fibre Channel Host Bus Adapters" \ + name="Fibre Channel HBA Port utility" +legacy pkg=SUNWfcprtr \ desc="NPIV Utility for Fibre Channel Host Bus Adapters (root)" \ - hotline="Please contact your local service provider" \ - name="Fibre Channel HBA Port NPIV utility (root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Fibre Channel HBA Port NPIV utility (root)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL depend fmri=service/storage/fibre-channel/fc-fabric type=require diff --git a/usr/src/pkg/manifests/system-storage-luxadm.mf b/usr/src/pkg/manifests/system-storage-luxadm.mf index 38f50070a8..54bd42b6a2 100644 --- a/usr/src/pkg/manifests/system-storage-luxadm.mf +++ b/usr/src/pkg/manifests/system-storage-luxadm.mf @@ -40,10 +40,8 @@ dir path=usr/sbin $(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/a5k_g_fc_i18n_cat $(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/ibfirmware file path=usr/sbin/luxadm mode=0555 -legacy pkg=SUNWluxop arch=$(ARCH) category=system \ +legacy pkg=SUNWluxop \ desc="Sun Enterprise Network Array firmware and utilities" \ - hotline="Please contact your local service provider" \ - name="Sun Enterprise Network Array firmware and utilities" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 + name="Sun Enterprise Network Array firmware and utilities" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-storage-parted.mf b/usr/src/pkg/manifests/system-storage-parted.mf index b817fec66e..fc18fbe4a6 100644 --- a/usr/src/pkg/manifests/system-storage-parted.mf +++ b/usr/src/pkg/manifests/system-storage-parted.mf @@ -52,12 +52,14 @@ file path=usr/include/parted/timer.h file path=usr/include/parted/unit.h file path=usr/lib/libparted.so.8 file path=usr/sbin/parted mode=0555 -legacy pkg=SUNWparted arch=$(ARCH) category=system \ +legacy pkg=SUNWparted \ desc="GNU Parted is for the display and manipulation of disk partitions" \ - hotline="Please contact your local service provider" \ - name="GNU Parted - Partition Editor" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="GNU Parted - Partition Editor" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL +license usr/src/cmd/parted/THIRDPARTYLICENSE \ + license=usr/src/cmd/parted/THIRDPARTYLICENSE +license usr/src/lib/libparted/THIRDPARTYLICENSE \ + license=usr/src/lib/libparted/THIRDPARTYLICENSE link path=usr/lib/libparted.so target=./libparted.so.8 depend fmri=system/file-system/ntfsprogs type=require diff --git a/usr/src/pkg/manifests/system-storage-sasinfo.mf b/usr/src/pkg/manifests/system-storage-sasinfo.mf index 4dd94e6e31..b0b772c075 100644 --- a/usr/src/pkg/manifests/system-storage-sasinfo.mf +++ b/usr/src/pkg/manifests/system-storage-sasinfo.mf @@ -53,19 +53,15 @@ file path=usr/lib/libsun_sas.so.1 file path=usr/lib/llib-lSMHBAAPI file path=usr/lib/llib-lSMHBAAPI.ln file path=usr/sbin/sasinfo mode=0555 -legacy pkg=SUNWsmhba arch=$(ARCH) category=system \ - desc="T11 Storage Management HBA API Libraries and CLI" \ - hotline="Please contact your local service provider" \ - name="SM-HBA Libraries and CLI" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsmhbar arch=$(ARCH) category=system \ +legacy pkg=SUNWsmhba desc="T11 Storage Management HBA API Libraries and CLI" \ + name="SM-HBA Libraries and CLI" +legacy pkg=SUNWsmhbar \ desc="T11 Storage Management HBA API Libraries and CLI (root)" \ - hotline="Please contact your local service provider" \ - name="SM-HBA Libraries and CLI (root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="SM-HBA Libraries and CLI (root)" license cr_Sun license=cr_Sun -license lib/smhba/THIRDPARTYLICENSE license=lib/smhba/THIRDPARTYLICENSE license lic_CDDL license=lic_CDDL +license usr/src/lib/smhba/THIRDPARTYLICENSE \ + license=usr/src/lib/smhba/THIRDPARTYLICENSE link path=usr/lib/$(ARCH64)/libSMHBAAPI.so target=libSMHBAAPI.so.1 link path=usr/lib/$(ARCH64)/libsun_sas.so target=libsun_sas.so.1 link path=usr/lib/libSMHBAAPI.so target=libSMHBAAPI.so.1 diff --git a/usr/src/pkg/manifests/system-tests-svr4.mf b/usr/src/pkg/manifests/system-tests-svr4.mf index 65446298c6..b62c94e51a 100644 --- a/usr/src/pkg/manifests/system-tests-svr4.mf +++ b/usr/src/pkg/manifests/system-tests-svr4.mf @@ -66,10 +66,7 @@ $(i386_ONLY)file path=usr/kernel/strmod/lmodb group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/strmod/lmode group=sys mode=0755 $(i386_ONLY)file path=usr/kernel/strmod/lmodr group=sys mode=0755 $(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 +legacy pkg=SUNWsvvs desc="System V Verification Suite Drivers" \ + name="System V Verification Suite Drivers" 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 236607c59e..3ba90e844f 100644 --- a/usr/src/pkg/manifests/system-tnf.mf +++ b/usr/src/pkg/manifests/system-tnf.mf @@ -56,11 +56,9 @@ file path=usr/lib/libtnfctl.so.1 file path=usr/lib/libtnfprobe.so.1 hardlink path=usr/bin/prex target=../lib/isaexec hardlink path=usr/bin/tnfxtract target=../lib/isaexec -legacy pkg=SUNWtnfc arch=$(ARCH) category=system \ +legacy pkg=SUNWtnfc \ desc="utilities needed to enable probe points, in the kernel and in applications, that can generate Trace Normal Format (TNF) records in a trace file" \ - hotline="Please contact your local service provider" \ - name="TNF Core Components" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="TNF Core Components" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libtnfctl.so target=libtnfctl.so.1 diff --git a/usr/src/pkg/manifests/system-trusted-global-zone.mf b/usr/src/pkg/manifests/system-trusted-global-zone.mf index 707a255a8d..5c0f9acd2f 100644 --- a/usr/src/pkg/manifests/system-trusted-global-zone.mf +++ b/usr/src/pkg/manifests/system-trusted-global-zone.mf @@ -79,13 +79,12 @@ 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" \ - name="Trusted Extensions global" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWtsg desc="Solaris Trusted Extensions, globalzone-only files" \ + name="Trusted Extensions global" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL 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 +# etc/security/lib/wdwmsg runs usr/bin/zenity +depend fmri=gnome/zenity type=require diff --git a/usr/src/pkg/manifests/system-trusted.mf b/usr/src/pkg/manifests/system-trusted.mf index f3bf08a940..4a6e85939b 100644 --- a/usr/src/pkg/manifests/system-trusted.mf +++ b/usr/src/pkg/manifests/system-trusted.mf @@ -120,16 +120,10 @@ 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 hardlink path=usr/sbin/remove_allocatable target=add_allocatable -legacy pkg=SUNWtsr arch=$(ARCH) category=system \ - desc="Solaris Trusted Extensions, (Root)" \ - hotline="Please contact your local service provider" \ - name="Trusted Extensions, (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWtsu arch=$(ARCH) category=system \ - desc="Solaris Trusted Extensions, (Usr)" \ - hotline="Please contact your local service provider" \ - name="Trusted Extensions, (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWtsr desc="Solaris Trusted Extensions, (Root)" \ + name="Trusted Extensions, (Root)" +legacy pkg=SUNWtsu desc="Solaris Trusted Extensions, (Usr)" \ + name="Trusted Extensions, (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/sbin/tnctl target=../../sbin/tnctl diff --git a/usr/src/pkg/manifests/system-xopen-xcu4.mf b/usr/src/pkg/manifests/system-xopen-xcu4.mf index 1bf6b0ec02..5ae8af2151 100644 --- a/usr/src/pkg/manifests/system-xopen-xcu4.mf +++ b/usr/src/pkg/manifests/system-xopen-xcu4.mf @@ -96,11 +96,9 @@ hardlink path=usr/xpg4/bin/vedit target=../../../usr/xpg4/bin/edit hardlink path=usr/xpg4/bin/vi target=../../../usr/xpg4/bin/edit 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 \ +legacy pkg=SUNWxcu4 \ 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 + name="XCU4 Utilities" 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 6e704636c6..d1fc24b2f1 100644 --- a/usr/src/pkg/manifests/system-xopen-xcu6.mf +++ b/usr/src/pkg/manifests/system-xopen-xcu6.mf @@ -45,13 +45,11 @@ hardlink path=usr/xpg6/bin/ex target=../../../usr/xpg6/bin/edit hardlink path=usr/xpg6/bin/vedit target=../../../usr/xpg6/bin/edit 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 \ +legacy pkg=SUNWxcu6 \ 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 + name="XCU6 Utilities" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/xpg6/bin/stty target=../../bin/stty -link path=usr/xpg6/bin/xargs target=../../bin/xargs link path=usr/xpg6/bin/tr target=../../bin/tr +link path=usr/xpg6/bin/xargs target=../../bin/xargs diff --git a/usr/src/pkg/manifests/system-xvm-ipagent.mf b/usr/src/pkg/manifests/system-xvm-ipagent.mf index 111cbc014a..23143a4eb3 100644 --- a/usr/src/pkg/manifests/system-xvm-ipagent.mf +++ b/usr/src/pkg/manifests/system-xvm-ipagent.mf @@ -47,16 +47,10 @@ dir path=usr/lib/xen/bin 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 -legacy pkg=SUNWxvmipar arch=$(ARCH) category=system \ - desc="xVM PV IP address agent" \ - hotline="Please contact your local service provider" \ - name="xVM PV IP address agent (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWxvmipau arch=$(ARCH) category=system \ - desc="xVM PV IP address agent" \ - hotline="Please contact your local service provider" \ - name="xVM PV IP address agent (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWxvmipar desc="xVM PV IP address agent" \ + name="xVM PV IP address agent (Root)" +legacy pkg=SUNWxvmipau desc="xVM PV IP address agent" \ + name="xVM PV IP address agent (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL depend fmri=system/xvm/xvmstore type=require diff --git a/usr/src/pkg/manifests/system-zones-brand-s10.mf b/usr/src/pkg/manifests/system-zones-brand-s10.mf index 56691f5343..d3330a2305 100644 --- a/usr/src/pkg/manifests/system-zones-brand-s10.mf +++ b/usr/src/pkg/manifests/system-zones-brand-s10.mf @@ -82,6 +82,7 @@ file path=usr/lib/brand/solaris10/preuninstall mode=0755 file path=usr/lib/brand/solaris10/s10_boot mode=0755 file path=usr/lib/brand/solaris10/s10_isaexec_wrapper mode=0755 file path=usr/lib/brand/solaris10/s10_native mode=0755 +file path=usr/lib/brand/solaris10/s10_net_physical mode=0755 file path=usr/lib/brand/solaris10/s10_python_wrapper mode=0755 file path=usr/lib/brand/solaris10/s10_replacefile mode=0755 file path=usr/lib/brand/solaris10/s10_support mode=0755 @@ -91,16 +92,10 @@ file path=usr/lib/brand/solaris10/uninstall mode=0755 file path=usr/lib/brand/solaris10/version mode=0444 file path=usr/lib/s10_brand.so.1 file path=usr/lib/s10_npreload.so.1 -legacy pkg=SUNWs10brandr arch=$(ARCH) category=system \ - desc="Support for the 'Solaris10' Brand" \ - hotline="Please contact your local service provider" \ - name="Solaris 10 Containers: solaris10 brand support (Root)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 -legacy pkg=SUNWs10brandu arch=$(ARCH) category=system \ - desc="Support for the 'solaris10' Brand" \ - hotline="Please contact your local service provider" \ - name="Solaris 10 Containers: solaris10 brand support (Usr)" \ - vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11 +legacy pkg=SUNWs10brandr desc="Support for the 'Solaris10' Brand" \ + name="Solaris 10 Containers: solaris10 brand support (Root)" +legacy pkg=SUNWs10brandu desc="Support for the 'solaris10' Brand" \ + name="Solaris 10 Containers: solaris10 brand support (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/brand/solaris10/64 target=$(ARCH64) diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.mf b/usr/src/pkg/manifests/system-zones-brand-sn1.mf index f44bb085e5..39d65c655a 100644 --- a/usr/src/pkg/manifests/system-zones-brand-sn1.mf +++ b/usr/src/pkg/manifests/system-zones-brand-sn1.mf @@ -63,16 +63,10 @@ file path=usr/lib/brand/sn1/platform.xml mode=0444 file path=usr/lib/brand/sn1/sn1_boot mode=0755 file path=usr/lib/brand/sn1/sn1_librtld_db.so.1 file path=usr/lib/sn1_brand.so.1 -legacy pkg=SUNWsn1rint arch=$(ARCH) category=system \ - desc="Support for the Fake Solaris N-1 Brand" \ - hotline="Please contact your local service provider" \ - name="Fake Solaris N-1 Brand (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWsn1uint arch=$(ARCH) category=system \ - desc="Support for the Fake Solaris N-1 Brand" \ - hotline="Please contact your local service provider" \ - name="Fake Solaris N-1 Brand (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWsn1rint desc="Support for the Fake Solaris N-1 Brand" \ + name="Fake Solaris N-1 Brand (Root)" +legacy pkg=SUNWsn1uint desc="Support for the Fake Solaris N-1 Brand" \ + name="Fake Solaris N-1 Brand (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/brand/sn1/64 target=$(ARCH64) diff --git a/usr/src/pkg/manifests/system-zones-internal.mf b/usr/src/pkg/manifests/system-zones-internal.mf index b32670ca79..40598c0012 100644 --- a/usr/src/pkg/manifests/system-zones-internal.mf +++ b/usr/src/pkg/manifests/system-zones-internal.mf @@ -36,20 +36,23 @@ dir path=usr/lib/$(ARCH64) file path=usr/include/libbrand.h file path=usr/include/libuutil.h file path=usr/include/libzonecfg.h +file path=usr/include/zonestat_impl.h file path=usr/lib/$(ARCH64)/llib-lbrand.ln file path=usr/lib/$(ARCH64)/llib-lzonecfg.ln +file path=usr/lib/$(ARCH64)/llib-lzonestat.ln file path=usr/lib/llib-lbrand file path=usr/lib/llib-lbrand.ln file path=usr/lib/llib-lzonecfg file path=usr/lib/llib-lzonecfg.ln -legacy pkg=SUNWzoneint arch=$(ARCH) category=system \ - desc="Solaris Zones internal files" \ - hotline="Please contact your local service provider" \ - name="Solaris Zones Internal Files" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.10.13 +file path=usr/lib/llib-lzonestat +file path=usr/lib/llib-lzonestat.ln +legacy pkg=SUNWzoneint desc="Solaris Zones internal files" \ + name="Solaris Zones Internal Files" version=11.11,REV=2009.10.13 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/lib/$(ARCH64)/libbrand.so target=./libbrand.so.1 link path=usr/lib/$(ARCH64)/libzonecfg.so target=./libzonecfg.so.1 +link path=usr/lib/$(ARCH64)/libzonestat.so target=./libzonestat.so.1 link path=usr/lib/libbrand.so target=./libbrand.so.1 link path=usr/lib/libzonecfg.so target=./libzonecfg.so.1 +link path=usr/lib/libzonestat.so target=./libzonestat.so.1 diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.mf index a641666aee..e2a45c43ee 100644 --- a/usr/src/pkg/manifests/system-zones.mf +++ b/usr/src/pkg/manifests/system-zones.mf @@ -62,13 +62,19 @@ file path=lib/svc/manifest/system/resource-mgmt.xml group=sys mode=0444 \ variant.opensolaris.zone=global file path=lib/svc/manifest/system/zones.xml group=sys mode=0444 \ variant.opensolaris.zone=global +file path=lib/svc/manifest/system/zonestat.xml group=sys mode=0444 \ + variant.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=lib/svc/method/svc-zonestat mode=0555 \ + variant.opensolaris.zone=global +file path=usr/bin/zonestat mode=0555 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 file path=usr/lib/$(ARCH64)/libzonecfg.so.1 +file path=usr/lib/$(ARCH64)/libzonestat.so.1 file path=usr/lib/brand/ipkg/config.xml mode=0444 file path=usr/lib/brand/ipkg/platform.xml mode=0444 file path=usr/lib/brand/shared/common.ksh mode=0444 @@ -76,23 +82,19 @@ file path=usr/lib/brand/shared/query mode=0755 file path=usr/lib/brand/shared/uninstall.ksh mode=0444 file path=usr/lib/libbrand.so.1 file path=usr/lib/libzonecfg.so.1 +file path=usr/lib/libzonestat.so.1 file path=usr/lib/zones/zoneadmd mode=0555 +file path=usr/lib/zones/zonestatd mode=0555 variant.opensolaris.zone=global file path=usr/sbin/zlogin mode=0555 file path=usr/sbin/zoneadm mode=0555 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 -legacy pkg=SUNWzoner arch=$(ARCH) category=system \ - desc="Solaris Zones Configuration Files" \ - hotline="Please contact your local service provider" \ - name="Solaris Zones (Root)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -legacy pkg=SUNWzoneu arch=$(ARCH) category=system \ - desc="Solaris Zones Configuration and Administration" \ - hotline="Please contact your local service provider" \ - name="Solaris Zones (Usr)" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 +legacy pkg=SUNWzoner desc="Solaris Zones Configuration Files" \ + name="Solaris Zones (Root)" +legacy pkg=SUNWzoneu desc="Solaris Zones Configuration and Administration" \ + name="Solaris Zones (Usr)" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL link path=usr/bin/zonename target=../../sbin/zonename diff --git a/usr/src/pkg/manifests/text-doctools.mf b/usr/src/pkg/manifests/text-doctools.mf index ca854af778..6c1adf881e 100644 --- a/usr/src/pkg/manifests/text-doctools.mf +++ b/usr/src/pkg/manifests/text-doctools.mf @@ -356,29 +356,40 @@ hardlink path=usr/share/lib/nterm/tab.300s-12 \ target=../../../../usr/share/lib/nterm/tab.300S-12 hardlink path=usr/share/lib/nterm/tab.4000a \ target=../../../../usr/share/lib/nterm/tab.4000A -legacy pkg=SUNWdoc arch=$(ARCH) category=system \ +legacy pkg=SUNWdoc \ desc="utilities and fonts for development, display, and production of documentation such as manual pages (nroff/troff)" \ - hotline="Please contact your local service provider" \ - name="Documentation Tools" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 -license cmd/checkeq/THIRDPARTYLICENSE license=cmd/checkeq/THIRDPARTYLICENSE -license cmd/checknr/THIRDPARTYLICENSE license=cmd/checknr/THIRDPARTYLICENSE -license cmd/eqn/THIRDPARTYLICENSE license=cmd/eqn/THIRDPARTYLICENSE -license cmd/man/src/THIRDPARTYLICENSE license=cmd/man/src/THIRDPARTYLICENSE -license cmd/man/src/util/THIRDPARTYLICENSE \ - license=cmd/man/src/util/THIRDPARTYLICENSE -license cmd/man/src/util/instant.src/THIRDPARTYLICENSE \ - license=cmd/man/src/util/instant.src/THIRDPARTYLICENSE -license cmd/man/src/util/nsgmls.src/COPYING \ - license=cmd/man/src/util/nsgmls.src/COPYING -license cmd/man/src/util/solbookv2/THIRDPARTYLICENSE \ - license=cmd/man/src/util/solbookv2/THIRDPARTYLICENSE -license cmd/refer/THIRDPARTYLICENSE license=cmd/refer/THIRDPARTYLICENSE -license cmd/soelim/THIRDPARTYLICENSE license=cmd/soelim/THIRDPARTYLICENSE -license cmd/tbl/THIRDPARTYLICENSE license=cmd/tbl/THIRDPARTYLICENSE -license cmd/ul/THIRDPARTYLICENSE license=cmd/ul/THIRDPARTYLICENSE -license cmd/vgrind/THIRDPARTYLICENSE license=cmd/vgrind/THIRDPARTYLICENSE + name="Documentation Tools" license cr_Sun license=cr_Sun +license usr/src/cmd/checkeq/THIRDPARTYLICENSE \ + license=usr/src/cmd/checkeq/THIRDPARTYLICENSE +license usr/src/cmd/checknr/THIRDPARTYLICENSE \ + license=usr/src/cmd/checknr/THIRDPARTYLICENSE +license usr/src/cmd/eqn/THIRDPARTYLICENSE \ + license=usr/src/cmd/eqn/THIRDPARTYLICENSE +license usr/src/cmd/man/src/THIRDPARTYLICENSE \ + license=usr/src/cmd/man/src/THIRDPARTYLICENSE +license usr/src/cmd/man/src/util/THIRDPARTYLICENSE \ + license=usr/src/cmd/man/src/util/THIRDPARTYLICENSE +license usr/src/cmd/man/src/util/instant.src/THIRDPARTYLICENSE \ + license=usr/src/cmd/man/src/util/instant.src/THIRDPARTYLICENSE +license usr/src/cmd/man/src/util/nsgmls.src/COPYING \ + license=usr/src/cmd/man/src/util/nsgmls.src/COPYING +license usr/src/cmd/man/src/util/solbookv2/THIRDPARTYLICENSE \ + license=usr/src/cmd/man/src/util/solbookv2/THIRDPARTYLICENSE +license usr/src/cmd/refer/THIRDPARTYLICENSE \ + license=usr/src/cmd/refer/THIRDPARTYLICENSE +license usr/src/cmd/soelim/THIRDPARTYLICENSE \ + license=usr/src/cmd/soelim/THIRDPARTYLICENSE +license usr/src/cmd/tbl/THIRDPARTYLICENSE \ + license=usr/src/cmd/tbl/THIRDPARTYLICENSE +license usr/src/cmd/ul/THIRDPARTYLICENSE \ + license=usr/src/cmd/ul/THIRDPARTYLICENSE +license usr/src/cmd/vgrind/THIRDPARTYLICENSE \ + license=usr/src/cmd/vgrind/THIRDPARTYLICENSE link path=usr/lib/tmac target=../share/lib/tmac link path=usr/man target=./share/man +# +# gpic is used as a preprocessor by the apropos command +# +depend fmri=text/groff type=require depend fmri=text/less type=require diff --git a/usr/src/pkg/manifests/text-locale.mf b/usr/src/pkg/manifests/text-locale.mf index 87daddb7ba..c37b608599 100644 --- a/usr/src/pkg/manifests/text-locale.mf +++ b/usr/src/pkg/manifests/text-locale.mf @@ -71,10 +71,8 @@ file path=usr/lib/locale/iso_8859_1/iso_8859_1.so.3 mode=0555 file path=usr/lib/localedef/src/iso_8859_1/charmap.src mode=0444 file path=usr/lib/localedef/src/iso_8859_1/extension.src mode=0444 file path=usr/lib/localedef/src/iso_8859_1/localedef.src mode=0444 -legacy pkg=SUNWloc arch=$(ARCH) category=system \ +legacy pkg=SUNWloc \ desc="localization utilities and C locale (POSIX default) definitions" \ - hotline="Please contact your local service provider" \ - name="System Localization" vendor="Sun Microsystems, Inc." \ - version=11.11,REV=2009.11.11 + name="System Localization" license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/transforms/defaults b/usr/src/pkg/transforms/defaults index 791c548cf0..34b3b4ee25 100644 --- a/usr/src/pkg/transforms/defaults +++ b/usr/src/pkg/transforms/defaults @@ -76,12 +76,19 @@ <transform file path=usr/share/src/grub/.+ -> default mode 0644> <transform file path=usr/share/.+ -> default mode 0444> - # # For what's left, go with root:bin 0644, +x for directories # -# <transform file dir -> default owner root> <transform file dir -> default group bin> <transform file -> default mode 0644> <transform dir -> default mode 0755> + +# +# Default values for legacy actions +# +<transform legacy -> default vendor "Oracle Corporation"> +<transform legacy -> default hotline "Please contact your local service provider"> +<transform legacy -> default category system> +<transform legacy -> default version "11.11,REV=2009.11.11"> +<transform legacy -> default arch $(ARCH)> diff --git a/usr/src/pkg/transforms/extract_metadata b/usr/src/pkg/transforms/extract_metadata index b831d68aa9..64f45192fd 100644 --- a/usr/src/pkg/transforms/extract_metadata +++ b/usr/src/pkg/transforms/extract_metadata @@ -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. # # @@ -31,6 +30,13 @@ <transform set name=org.opensolaris.redist value=nonredist|internal -> print REPO=extra> # +# Pull out the license paths for staging in the proto area. Ignore +# those with no path separators, as that indicates a file kept in +# $SRC/pkg/license_files, rather than alongside the associated source. +# +<transform license license=.*/.+ -> print LICS="${LICS} %(license)"> + +# # Ordering is important here, and the last line wins. # # The default of "current" is provided by the calling environment, |