From 119d3eb13221d53889ac8a032e7a93c0f86507fd Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Thu, 8 Dec 2016 14:32:40 +0200 Subject: [PATCH] don't ship closed kernel/kmdb/mdb components --- exception_lists/closed-bins | 23 ++---- usr/src/Makefile | 5 +- usr/src/man/man7d/Makefile | 1 - usr/src/man/man7d/bcm_sata.7d | 73 ------------------- usr/src/pkg/manifests/developer-debug-mdb.mf | 8 --- usr/src/pkg/manifests/driver-graphics-atiatom.mf | 51 +------------- usr/src/pkg/manifests/driver-network-bnx.mf | 64 +---------------- usr/src/pkg/manifests/driver-network-ixgb.mf | 56 +-------------- usr/src/pkg/manifests/driver-network-sdpib.mf | 57 +-------------- usr/src/pkg/manifests/driver-serial-usbser_edge.mf | 82 +--------------------- usr/src/pkg/manifests/driver-sparc-platform.mf | 19 ----- usr/src/pkg/manifests/driver-storage-adpu320.mf | 64 +---------------- usr/src/pkg/manifests/driver-storage-bcm_sata.mf | 55 +-------------- usr/src/pkg/manifests/driver-storage-glm.mf | 52 +------------- usr/src/pkg/manifests/driver-storage-lsimega.mf | 59 +--------------- .../pkg/manifests/driver-storage-marvell88sx.mf | 56 +-------------- usr/src/pkg/manifests/system-kernel-platform.mf | 10 --- usr/src/pkg/manifests/system-kernel.mf | 31 -------- usr/src/pkg/manifests/system-library.mf | 4 -- .../io/scsi/adapters/scsi_vhci/scsi_vhci.conf | 5 -- 20 files changed, 35 insertions(+), 740 deletions(-) delete mode 100644 usr/src/man/man7d/bcm_sata.7d rewrite usr/src/pkg/manifests/driver-graphics-atiatom.mf (96%) rewrite usr/src/pkg/manifests/driver-network-bnx.mf (97%) rewrite usr/src/pkg/manifests/driver-network-ixgb.mf (97%) rewrite usr/src/pkg/manifests/driver-network-sdpib.mf (97%) rewrite usr/src/pkg/manifests/driver-serial-usbser_edge.mf (97%) rewrite usr/src/pkg/manifests/driver-storage-adpu320.mf (100%) rewrite usr/src/pkg/manifests/driver-storage-bcm_sata.mf (96%) rewrite usr/src/pkg/manifests/driver-storage-glm.mf (96%) rewrite usr/src/pkg/manifests/driver-storage-lsimega.mf (96%) rewrite usr/src/pkg/manifests/driver-storage-marvell88sx.mf (96%) diff --git a/exception_lists/closed-bins b/exception_lists/closed-bins index 044a2b8d81..f5dafe44ef 100644 --- a/exception_lists/closed-bins +++ b/exception_lists/closed-bins @@ -13,30 +13,13 @@ ./etc/snmp/conf ./etc/snmp/conf/mibiisa.reg ./etc/snmp/conf/snmp.conf -./kernel/drv/cpqary3 -./kernel/drv/cpqary3.conf -./kernel/drv/amd64/cpqary3 -./kernel/drv/bnxe -./kernel/drv/bnxe.conf -./kernel/drv/amd64/bnxe -./kernel/drv/iprb -./kernel/drv/amd64/iprb -./kernel/drv/pcn -./kernel/drv/amd64/pcn -./kernel/drv/pcser -./kernel/drv/amd64/pcser -./kernel/drv/sparcv9/pcser -./kernel/misc/klmmod -./kernel/misc/amd64/klmmod -./kernel/misc/klmops -./kernel/misc/amd64/klmops +./kernel ./lib/crypto ./lib/crypto/kcfd ./lib/libc_i18n.a ./lib/amd64/libc_i18n.a ./lib/sparcv9/libc_i18n.a -./platform/sun4v/kernel/drv/ncp.conf -./platform/sun4v/kernel/drv/n2cp.conf +./platform ./usr/has ./usr/has/bin ./usr/has/bin/patch @@ -79,7 +62,9 @@ ./usr/lib/localedef/src/iso_8859_1/charmap.src ./usr/lib/localedef/src/iso_8859_1/extension.src ./usr/lib/localedef/src/iso_8859_1/localedef.src +./usr/lib/mdb ./usr/lib/nfs/lockd +./usr/lib/raidcfg ./usr/lib/snmp ./usr/lib/snmp/mibiisa ./usr/bin/iconv diff --git a/usr/src/Makefile b/usr/src/Makefile index 92888e548f..4f7a772b5e 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -159,10 +159,7 @@ closedbins: bldtools $(ROOTDIRS) FRC $(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \ (cd $$CLOSED_ROOT; \ $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \ - (cd $(ROOT); $(TAR) xBpf -); \ - ( cd $(ROOT); $(CTFSTRIP) $$(cd $$CLOSED_ROOT; $(FIND) \ - ./kernel ./usr/kernel ./platform/*/kernel -type f -a -perm -u+x | \ - $(EGREP) -vf $(CODEMGR_WS)/exception_lists/closed-bins) ) + (cd $(ROOT); $(TAR) xBpf -) # # Declare what parts can be built in parallel diff --git a/usr/src/man/man7d/Makefile b/usr/src/man/man7d/Makefile index 3e3322ff02..2e282e38a7 100644 --- a/usr/src/man/man7d/Makefile +++ b/usr/src/man/man7d/Makefile @@ -197,7 +197,6 @@ i386_MANFILES= ahci.7d \ audiosolo.7d \ audiovia823x.7d \ audiovia97.7d \ - bcm_sata.7d \ bfe.7d \ cmdk.7d \ cpqary3.7d \ diff --git a/usr/src/man/man7d/bcm_sata.7d b/usr/src/man/man7d/bcm_sata.7d deleted file mode 100644 index a536507864..0000000000 --- a/usr/src/man/man7d/bcm_sata.7d +++ /dev/null @@ -1,73 +0,0 @@ -'\" te -.\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved -.\" 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] -.TH BCM_SATA 7D "Aug 31, 2009" -.SH NAME -bcm_sata \- Broadcom HT1000 SATA controller driver -.SH SYNOPSIS -.sp -.LP -\fBsata@\fR\fIunit-address\fR -.SH DESCRIPTION -.sp -.LP -The \fBbcm_sata\fR driver is a SATA HBA driver that supports Broadcom HT1000 -SATA HBA controllers. -.sp -.LP -HT1000 SATA controllers are compliant with the Serial ATA 1.0 specification and -SATA II Phase 1.0 specification (the extension to the SATA 1.0 specification). -These HT1000 controllers support standard SATA features including SATA-II -disks, NCQ, hotplug, ATAPI devices and port multiplier. -.sp -.LP -The driver does not currently support NCQ and port multiplier features. -.SS "Configuration" -.sp -.LP -The \fBbcm_sata\fR module contains no user configurable parameters. -.SH FILES -.sp -.ne 2 -.na -\fB\fB/kernel/drv/bcm_sata\fR\fR -.ad -.RS 30n -32-bit ELF kernel module (x86) -.RE - -.sp -.ne 2 -.na -\fB\fB/kernel/drv/amd64/bcm_sata\fR\fR -.ad -.RS 30n -64-bit ELF kernel module (x86) -.RE - -.SH ATTRIBUTES -.sp -.LP -See \fBattributes\fR(5) for a description of the following attributes: -.sp - -.sp -.TS -box; -l | l -l | l . -ATTRIBUTE TYPE ATTRIBUTE VALUE -_ -Architecture x86 -.TE - -.SH SEE ALSO -.sp -.LP -\fBcfgadm\fR(1M), \fBcfgadm_sata\fR(1M), \fBprtconf\fR(1M), -\fBattributes\fR(5), \fBsata\fR(7D), \fBsd\fR(7D) -.sp -.LP -\fIWriting Device Drivers\fR diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf index cdc7daa19a..ed3a00f314 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb.mf @@ -109,11 +109,9 @@ file path=kernel/kmdb/$(ARCH64)/logindmux group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/mac group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/mdb_ds group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/mm group=sys mode=0555 -file path=kernel/kmdb/$(ARCH64)/mpt group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/mpt_sas group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/mr_sas group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/neti group=sys mode=0555 -file path=kernel/kmdb/$(ARCH64)/nfs group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/ptm group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/random group=sys mode=0555 file path=kernel/kmdb/$(ARCH64)/s1394 group=sys mode=0555 @@ -145,11 +143,9 @@ $(i386_ONLY)file path=kernel/kmdb/logindmux group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/mac group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/mdb_ds group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/mm group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/mpt group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/mpt_sas group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/mr_sas group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/neti group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/nfs group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/ptm group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/random group=sys mode=0555 $(i386_ONLY)file path=kernel/kmdb/s1394 group=sys mode=0555 @@ -226,11 +222,9 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/mac.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/mdb_kb.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/mdb_ks.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/mm.so group=sys mode=0555 -file path=usr/lib/mdb/kvm/$(ARCH64)/mpt.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/mpt_sas.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/mr_sas.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/neti.so group=sys mode=0555 -file path=usr/lib/mdb/kvm/$(ARCH64)/nfs.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/ptm.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/random.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/s1394.so group=sys mode=0555 @@ -264,11 +258,9 @@ $(i386_ONLY)file path=usr/lib/mdb/kvm/mac.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/mdb_kb.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/mdb_ks.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/mm.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/mpt.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/mpt_sas.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/mr_sas.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/neti.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/nfs.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/ptm.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/random.so group=sys mode=0555 $(i386_ONLY)file path=usr/lib/mdb/kvm/s1394.so group=sys mode=0555 diff --git a/usr/src/pkg/manifests/driver-graphics-atiatom.mf b/usr/src/pkg/manifests/driver-graphics-atiatom.mf dissimilarity index 96% index 6a4a28a973..76a9d96f90 100644 --- a/usr/src/pkg/manifests/driver-graphics-atiatom.mf +++ b/usr/src/pkg/manifests/driver-graphics-atiatom.mf @@ -1,48 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/graphics/atiatom@$(PKGVERS) -set name=pkg.description value="Drivers for ATI framebuffer hardware" -set name=pkg.summary value="ATI Framebuffer Drivers" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Display -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -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 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 +set name=pkg.fmri value=pkg:/driver/graphics/atiatom@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-network-bnx.mf b/usr/src/pkg/manifests/driver-network-bnx.mf dissimilarity index 97% index da9471a01a..e139afa505 100644 --- a/usr/src/pkg/manifests/driver-network-bnx.mf +++ b/usr/src/pkg/manifests/driver-network-bnx.mf @@ -1,61 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/network/bnx@$(PKGVERS) -set name=pkg.description \ - value="Broadcom NetXtreme II Gigabit Ethernet PCI-X/PCIE Adapter Driver" -set name=pkg.summary \ - value="Broadcom NetXtreme II Gigabit Ethernet Adapter Driver" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Networking -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=bnx perms="* 0644 root sys" \ - alias=pci14e4,1639 \ - alias=pci14e4,163a \ - alias=pci14e4,163b \ - alias=pci14e4,163c \ - alias=pci14e4,164a \ - alias=pci14e4,164c \ - alias=pci14e4,16aa \ - alias=pci14e4,16ac -file path=kernel/drv/$(ARCH64)/bnx group=sys -file path=kernel/drv/bnx group=sys -file path=kernel/drv/bnx.conf group=sys preserve=renamenew -legacy pkg=BRCMbnx \ - desc="Broadcom NetXtreme II Gigabit Ethernet PCI-X/PCIE Adapter Driver" \ - name="Broadcom NetXtreme II Gigabit Ethernet Adapter Driver" \ - vendor="Broadcom Corporation, Inc." -license cr_Sun license=cr_Sun -license lic_OSBL license=lic_OSBL -license lic_OSBL_preamble license=lic_OSBL_preamble +set name=pkg.fmri value=pkg:/driver/network/bnx@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-network-ixgb.mf b/usr/src/pkg/manifests/driver-network-ixgb.mf dissimilarity index 97% index 5db8ec7249..153e40bdee 100644 --- a/usr/src/pkg/manifests/driver-network-ixgb.mf +++ b/usr/src/pkg/manifests/driver-network-ixgb.mf @@ -1,53 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/network/ixgb@$(PKGVERS) -set name=pkg.description value="Intel(R) PRO/10G Server Adapter Driver" -set name=pkg.summary value="Intel(R) PRO/10G Server Adapter Driver" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Networking -set name=variant.arch value=$(ARCH) -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=ixgb perms="* 0666 root root" \ - alias=pci8086,1048 \ - alias=pci8086,109e \ - alias=pci8086,1a48 \ - alias=pci8086,a11f -file path=kernel/drv/$(ARCH64)/ixgb group=sys -$(i386_ONLY)file path=kernel/drv/ixgb group=sys -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 +set name=pkg.fmri value=pkg:/driver/network/ixgb@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-network-sdpib.mf b/usr/src/pkg/manifests/driver-network-sdpib.mf dissimilarity index 97% index ad7919cbbd..19787e75a4 100644 --- a/usr/src/pkg/manifests/driver-network-sdpib.mf +++ b/usr/src/pkg/manifests/driver-network-sdpib.mf @@ -1,54 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/network/sdpib@$(PKGVERS) -set name=pkg.description value="Sun InfiniBand Sockets Direct Protocol" -set name=pkg.summary value="Sun InfiniBand Sockets Direct Protocol" -set name=info.classification \ - value=org.opensolaris.category.2008:System/Hardware -set name=variant.arch value=$(ARCH) -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -dir path=kernel/strmod group=sys -dir path=kernel/strmod/$(ARCH64) group=sys -driver name=sdpib perms="* 0644 root sys" -file path=kernel/drv/$(ARCH64)/sdpib group=sys -$(i386_ONLY)file path=kernel/drv/sdpib group=sys -file path=kernel/drv/sdpib.conf group=sys -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 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 +set name=pkg.fmri value=pkg:/driver/network/sdpib@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf dissimilarity index 97% index 0d8b687ce4..50d3f84112 100644 --- a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf +++ b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf @@ -1,79 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/serial/usbser_edge@$(PKGVERS) -set name=pkg.description value="USB Digi Edgeport serial driver" -set name=pkg.summary value="USB Digi Edgeport serial driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports -set name=variant.arch value=$(ARCH) -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=usbser_edge perms="* 0666 root sys" \ - alias=usbif1608,1.100.config1.0 \ - alias=usbif1608,1.config1.0 \ - alias=usbif1608,10.config1.0 \ - alias=usbif1608,11.config1.0 \ - alias=usbif1608,12.config1.0 \ - alias=usbif1608,13.config1.0 \ - alias=usbif1608,14.config1.0 \ - alias=usbif1608,201.config1.0 \ - alias=usbif1608,205.config1.0 \ - alias=usbif1608,206.config1.0 \ - alias=usbif1608,207.config1.0 \ - alias=usbif1608,20c.config1.0 \ - alias=usbif1608,20d.config1.0 \ - alias=usbif1608,215.config1.0 \ - alias=usbif1608,217.config1.0 \ - alias=usbif1608,21a.config1.0 \ - alias=usbif1608,240.config1.0 \ - alias=usbif1608,241.config1.0 \ - alias=usbif1608,242.config1.0 \ - alias=usbif1608,243.config1.0 \ - alias=usbif1608,244.config1.0 \ - alias=usbif1608,247.config1.0 \ - alias=usbif1608,3.config1.0 \ - alias=usbif1608,4.config1.0 \ - alias=usbif1608,5.config1.0 \ - alias=usbif1608,6.config1.0 \ - alias=usbif1608,7.config1.0 \ - alias=usbif1608,c.config1.0 \ - alias=usbif1608,d.config1.0 \ - alias=usbif1608,e.config1.0 \ - alias=usbif1608,f.config1.0 -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 preserve=true -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 +set name=pkg.fmri value=pkg:/driver/serial/usbser_edge@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-sparc-platform.mf b/usr/src/pkg/manifests/driver-sparc-platform.mf index ec0734b366..ade27d9e66 100644 --- a/usr/src/pkg/manifests/driver-sparc-platform.mf +++ b/usr/src/pkg/manifests/driver-sparc-platform.mf @@ -41,29 +41,10 @@ dir path=kernel/drv/$(ARCH64) group=sys driver name=ecpp perms="* 0666 root sys" \ alias=ns87317-ecpp \ alias=pnpALI,1533,3 -driver name=glm class=scsi \ - alias=pci1000,1 \ - alias=pci1000,20 \ - alias=pci1000,21 \ - alias=pci1000,b \ - alias=pci1000,c \ - alias=pci1000,f -driver name=mpt class=scsi \ - alias=pci1000,30 \ - alias=pci1000,50 \ - alias=pci1000,54 \ - alias=pci1000,56 \ - alias=pci1000,58 \ - alias=pci1000,62 \ - alias=pciex1000,56 \ - alias=pciex1000,58 \ - alias=pciex1000,62 driver name=se perms="[0-7],hdlc 0666 root sys" perms="[a-h] 0666 root sys" \ perms="[a-h],cu 0600 uucp uucp" perms="ssp 0600 root sys" \ perms="sspctl 0600 root sys" file path=kernel/drv/$(ARCH64)/ecpp group=sys -file path=kernel/drv/$(ARCH64)/glm group=sys -file path=kernel/drv/$(ARCH64)/mpt group=sys file path=kernel/drv/$(ARCH64)/se group=sys file path=kernel/drv/ecpp.conf group=sys file path=kernel/drv/mpt.conf group=sys preserve=true diff --git a/usr/src/pkg/manifests/driver-storage-adpu320.mf b/usr/src/pkg/manifests/driver-storage-adpu320.mf dissimilarity index 100% index aeddd7d411..200097a5a6 100644 --- a/usr/src/pkg/manifests/driver-storage-adpu320.mf +++ b/usr/src/pkg/manifests/driver-storage-adpu320.mf @@ -1,61 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/storage/adpu320@$(PKGVERS) -set name=pkg.description value="Adaptec 7902 SCSI Driver" -set name=pkg.summary value="Adaptec Ultra320 Driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=adpu320 class=scsi perms="adpu320ctl 0666 root root" \ - alias=pci9005,8000 \ - alias=pci9005,800f.9005.5f \ - alias=pci9005,8010 \ - alias=pci9005,8011 \ - alias=pci9005,8012 \ - alias=pci9005,8014 \ - alias=pci9005,8015 \ - alias=pci9005,8016 \ - alias=pci9005,8017 \ - alias=pci9005,801d \ - alias=pci9005,801e \ - alias=pci9005,801f \ - alias=pci9005,808f -file path=kernel/drv/$(ARCH64)/adpu320 group=sys -file path=kernel/drv/adpu320 group=sys -file path=kernel/drv/adpu320.conf group=sys -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 +set name=pkg.fmri value=pkg:/driver/storaget/adpu320@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf dissimilarity index 96% index e3406d812c..98b1af5279 100644 --- a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf +++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf @@ -1,52 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/storage/bcm_sata@$(PKGVERS) -set name=pkg.description value="BroadCom ht1000 sata driver" -set name=pkg.summary value="BroadCom ht1000 sata driver" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Storage -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -dir path=usr/share/man -dir path=usr/share/man/man7d -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 -file path=usr/share/man/man7d/bcm_sata.7d -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 +set name=pkg.fmri value=pkg:/driver/storage/bcm_sata@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-storage-glm.mf b/usr/src/pkg/manifests/driver-storage-glm.mf dissimilarity index 96% index 3d6ff80d26..416c3bd6ce 100644 --- a/usr/src/pkg/manifests/driver-storage-glm.mf +++ b/usr/src/pkg/manifests/driver-storage-glm.mf @@ -1,49 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/storage/glm@$(PKGVERS) -set name=pkg.description value="Drivers for the PCI bus" -set name=pkg.summary value="PCI Drivers" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Storage -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=glm alias=pci1000,b class=scsi perms="* 0755 root sys" -file path=kernel/drv/$(ARCH64)/glm group=sys -file path=kernel/drv/glm group=sys -file path=kernel/drv/glm.conf group=sys -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 -license lic_OSBL_preamble license=lic_OSBL_preamble +set name=pkg.fmri value=pkg:/driver/storage/glm@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-storage-lsimega.mf b/usr/src/pkg/manifests/driver-storage-lsimega.mf dissimilarity index 96% index fe3adcb862..34012643d9 100644 --- a/usr/src/pkg/manifests/driver-storage-lsimega.mf +++ b/usr/src/pkg/manifests/driver-storage-lsimega.mf @@ -1,56 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/storage/lsimega@$(PKGVERS) -set name=pkg.description value="LSI Hardware RAID HBA Driver" -set name=pkg.summary value="LSI Hardware RAID HBA Driver" -set name=info.classification \ - value=org.opensolaris.category.2008:Drivers/Storage -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=lsimega class=scsi \ - alias=pci1000,1960 \ - alias=pci1000,407 \ - alias=pci1000,407.1000.532 \ - alias=pci1000,408 \ - alias=pci1000,408.1000.2 \ - alias=pci1000,409 \ - alias=pci1028,13 -file path=kernel/drv/$(ARCH64)/lsimega group=sys -file path=kernel/drv/lsimega group=sys -file path=kernel/drv/lsimega.conf group=sys -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 +set name=pkg.fmri value=pkg:/driver/storage/lsimega@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf dissimilarity index 96% index 16b46a6614..26a15f8a44 100644 --- a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf +++ b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf @@ -1,53 +1,3 @@ -# -# 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. -# - -set name=pkg.fmri value=pkg:/driver/storage/marvell88sx@$(PKGVERS) -set name=pkg.description value="Marvell 88sx sata driver" -set name=pkg.summary value="Marvell 88sx sata driver" -set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports -set name=variant.arch value=i386 -dir path=kernel group=sys -dir path=kernel/drv group=sys -dir path=kernel/drv/$(ARCH64) group=sys -driver name=marvell88sx class=scsi-self-identifying perms="* 0644 root sys" \ - alias=pci11ab,5040 \ - alias=pci11ab,5041 \ - alias=pci11ab,5080 \ - alias=pci11ab,5081 \ - alias=pci11ab,6041.9 \ - alias=pci11ab,6081.9 -file path=kernel/drv/$(ARCH64)/marvell88sx group=sys -file path=kernel/drv/marvell88sx group=sys -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 +set name=pkg.fmri value=pkg:/driver/storage/marvell88sx@$(PKGVERS) +set name=pkg.obsolete value=true +set name=org.opensolaris.noincorp value=true diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.mf index 0e3b71645c..9a86b837a6 100644 --- a/usr/src/pkg/manifests/system-kernel-platform.mf +++ b/usr/src/pkg/manifests/system-kernel-platform.mf @@ -819,9 +819,6 @@ $(i386_ONLY)file \ mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \ group=sys mode=0755 -$(i386_ONLY)file \ - path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.46 \ - group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu.generic group=sys \ mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD group=sys \ @@ -830,8 +827,6 @@ $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD.15 \ group=sys mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel group=sys \ mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46 \ - group=sys mode=0755 $(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 \ @@ -1173,11 +1168,6 @@ $(sparc_ONLY)file path=usr/share/man/man7d/tsalarm.7d $(sparc_ONLY)file path=usr/share/man/man7d/zs.7d $(sparc_ONLY)file path=usr/share/man/man7d/zsh.7d $(sparc_ONLY)file path=usr/share/man/man7m/kb.7m -$(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 \ diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf index 5bc2b3d0a9..7b5c49c4ee 100644 --- a/usr/src/pkg/manifests/system-kernel.mf +++ b/usr/src/pkg/manifests/system-kernel.mf @@ -157,7 +157,6 @@ $(i386_ONLY)driver name=intel_nb5000 \ $(i386_ONLY)driver name=intel_nhm \ alias=pci8086,3423 \ alias=pci8086,372a -$(i386_ONLY)driver name=intel_nhmex alias=pci8086,3438 driver name=ip perms="ip 0666 root sys" \ policy="read_priv_set=net_rawaccess write_priv_set=net_rawaccess" driver name=ip6 perms="ip6 0666 root sys" \ @@ -189,16 +188,6 @@ driver name=mm perms="allkmem 0600 root sys" perms="kmem 0640 root sys" \ policy="kmem read_priv_set=none write_priv_set=all" \ policy="mem read_priv_set=none write_priv_set=all" driver name=mouse8042 alias=pnpPNP,f03 -$(i386_ONLY)driver name=mpt class=scsi \ - alias=pci1000,30 \ - alias=pci1000,50 \ - alias=pci1000,54 \ - alias=pci1000,56 \ - alias=pci1000,58 \ - alias=pci1000,62 \ - alias=pciex1000,56 \ - alias=pciex1000,58 \ - alias=pciex1000,62 driver name=nulldriver \ alias=scsa,nodev \ alias=scsa,probe @@ -334,7 +323,6 @@ $(sparc_ONLY)file path=kernel/dacf/$(ARCH64)/consconfig_dacf group=sys \ file path=kernel/dacf/$(ARCH64)/net_dacf group=sys mode=0755 $(i386_ONLY)file path=kernel/dacf/net_dacf group=sys mode=0755 $(i386_ONLY)file path=kernel/drv/$(ARCH64)/acpi_drv group=sys -$(i386_ONLY)file path=kernel/drv/$(ARCH64)/acpi_toshiba group=sys file path=kernel/drv/$(ARCH64)/aggr group=sys file path=kernel/drv/$(ARCH64)/arp group=sys file path=kernel/drv/$(ARCH64)/bl group=sys @@ -358,7 +346,6 @@ file path=kernel/drv/$(ARCH64)/icmp group=sys file path=kernel/drv/$(ARCH64)/icmp6 group=sys $(i386_ONLY)file path=kernel/drv/$(ARCH64)/intel_nb5000 group=sys $(i386_ONLY)file path=kernel/drv/$(ARCH64)/intel_nhm group=sys -$(i386_ONLY)file path=kernel/drv/$(ARCH64)/intel_nhmex group=sys file path=kernel/drv/$(ARCH64)/ip group=sys file path=kernel/drv/$(ARCH64)/ip6 group=sys file path=kernel/drv/$(ARCH64)/ipnet group=sys @@ -376,7 +363,6 @@ file path=kernel/drv/$(ARCH64)/log group=sys $(i386_ONLY)file path=kernel/drv/$(ARCH64)/mc-amd group=sys file path=kernel/drv/$(ARCH64)/mm group=sys file path=kernel/drv/$(ARCH64)/mouse8042 group=sys -$(i386_ONLY)file path=kernel/drv/$(ARCH64)/mpt group=sys file path=kernel/drv/$(ARCH64)/nulldriver group=sys file path=kernel/drv/$(ARCH64)/openeepr group=sys file path=kernel/drv/$(ARCH64)/options group=sys @@ -418,7 +404,6 @@ file path=kernel/drv/$(ARCH64)/vnic group=sys file path=kernel/drv/$(ARCH64)/wc group=sys $(i386_ONLY)file path=kernel/drv/acpi_drv group=sys $(i386_ONLY)file path=kernel/drv/acpi_drv.conf group=sys -$(i386_ONLY)file path=kernel/drv/acpi_toshiba group=sys $(i386_ONLY)file path=kernel/drv/aggr group=sys file path=kernel/drv/aggr.conf group=sys $(i386_ONLY)file path=kernel/drv/arp group=sys @@ -462,8 +447,6 @@ $(i386_ONLY)file path=kernel/drv/intel_nb5000 group=sys $(i386_ONLY)file path=kernel/drv/intel_nb5000.conf group=sys $(i386_ONLY)file path=kernel/drv/intel_nhm group=sys $(i386_ONLY)file path=kernel/drv/intel_nhm.conf group=sys -$(i386_ONLY)file path=kernel/drv/intel_nhmex group=sys -$(i386_ONLY)file path=kernel/drv/intel_nhmex.conf group=sys $(i386_ONLY)file path=kernel/drv/ip group=sys file path=kernel/drv/ip.conf group=sys $(i386_ONLY)file path=kernel/drv/ip6 group=sys @@ -496,8 +479,6 @@ $(i386_ONLY)file path=kernel/drv/mc-amd.conf group=sys $(i386_ONLY)file path=kernel/drv/mm group=sys file path=kernel/drv/mm.conf group=sys $(i386_ONLY)file path=kernel/drv/mouse8042 group=sys -$(i386_ONLY)file path=kernel/drv/mpt group=sys -$(i386_ONLY)file path=kernel/drv/mpt.conf group=sys preserve=true $(i386_ONLY)file path=kernel/drv/nulldriver group=sys $(i386_ONLY)file path=kernel/drv/openeepr group=sys file path=kernel/drv/openeepr.conf group=sys @@ -703,31 +684,19 @@ $(i386_ONLY)file path=kernel/misc/pcihp group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/rpcsec group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/sata group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/scsi group=sys mode=0755 -file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_emc group=sys \ - mode=0755 -file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_lsi group=sys \ - mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_sun group=sys \ mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym group=sys mode=0755 -file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym_emc group=sys \ - mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_sym_hds group=sys \ mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tape group=sys mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs group=sys mode=0755 file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs_tape group=sys \ mode=0755 -$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_emc group=sys \ - mode=0755 -$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_lsi group=sys \ - mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_sun group=sys \ mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym group=sys \ mode=0755 -$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym_emc group=sys \ - mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym_hds group=sys \ mode=0755 $(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tape group=sys \ diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf index 792a6c1b7d..434a0d732d 100644 --- a/usr/src/pkg/manifests/system-library.mf +++ b/usr/src/pkg/manifests/system-library.mf @@ -102,8 +102,6 @@ dir path=usr/lib/lwp/$(ARCH64) dir path=usr/lib/python$(PYTHON_VERSION) dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages dir path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris -dir path=usr/lib/raidcfg -dir path=usr/lib/raidcfg/$(ARCH64) dir path=usr/lib/scsi dir path=usr/lib/scsi/$(ARCH64) dir path=usr/lib/scsi/plugins @@ -457,8 +455,6 @@ file path=usr/lib/passwdutil.so.1 file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/__init__.py file path=usr/lib/python$(PYTHON_VERSION)/vendor-packages/solaris/__init__.pyc file path=usr/lib/python$(PYTHON_VERSION)/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 file path=usr/lib/scsi/$(ARCH64)/libses.so.1 file path=usr/lib/scsi/$(ARCH64)/libsmp.so.1 diff --git a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.conf b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.conf index 22165a6654..264ea9da56 100644 --- a/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.conf +++ b/usr/src/uts/common/io/scsi/adapters/scsi_vhci/scsi_vhci.conf @@ -52,13 +52,8 @@ auto-failback="enable"; # "failover-module-name" is also used in the override mechanism below. ddi-forceload = "misc/scsi_vhci/scsi_vhci_f_asym_sun", - "misc/scsi_vhci/scsi_vhci_f_asym_lsi", - "misc/scsi_vhci/scsi_vhci_f_asym_emc", - "misc/scsi_vhci/scsi_vhci_f_sym_emc", "misc/scsi_vhci/scsi_vhci_f_sym_hds", "misc/scsi_vhci/scsi_vhci_f_sym", -# "misc/scsi_vhci/scsi_vhci_f_tpgs_tape", -# "misc/scsi_vhci/scsi_vhci_f_tape", "misc/scsi_vhci/scsi_vhci_f_tpgs"; # -- 2.11.4.GIT