Mercurial > illumos > illumos-gate

changeset 12789:0b7f2daa174e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
40 llc2 has got to go Reviewed by: richlowe@richlowe.net Approved by: garrett@nexenta.com
author Garrett D'Amore <garrett@nexenta.com>
date Mon, 16 Aug 2010 16:22:01 -0700
parents 9d56504d6906
children e1c710858516
files exception_lists/packaging.open usr/src/cmd/Makefile usr/src/pkg/manifests/SUNWllc.mf usr/src/pkg/manifests/driver-network-llc2.mf usr/src/uts/intel/Makefile.intel.shared usr/src/uts/sparc/Makefile.sparc.shared
diffstat 6 files changed, 32 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/exception_lists/packaging.open	Sun Aug 15 23:46:06 2010 -0700
+++ b/exception_lists/packaging.open	Mon Aug 16 16:22:01 2010 -0700
@@ -36,3 +36,30 @@
 kernel/drv/sparcv9/dprov	sparc
 
 usr/has/bin/pfksh
+
+#
+# we don't deliver these closed bits anymore... this
+# list can go away once we purge closed from illumos entirely.
+#
+# llc2
+etc/init.d/llc2
+etc/llc2
+etc/llc2/default
+etc/llc2/llc2_start.default
+etc/rc0.d/K52llc2
+etc/rc1.d/K52llc2
+etc/rc2.d/S40llc2
+etc/rcS.d/K52llc2
+usr/kernel/drv/llc2		i386
+usr/kernel/drv/amd64/llc2	i386
+usr/kernel/drv/sparcv9/llc2	sparc
+usr/kernel/drv/llc2.conf
+usr/lib/llc2
+usr/lib/llc2/llc2_autoconfig
+usr/lib/llc2/llc2_config
+usr/lib/llc2/llc2_loop2
+usr/lib/llc2/llc2_loop3
+usr/lib/llc2/llc2_loop4
+usr/lib/llc2/llc2_stats
+usr/lib/llc2/llc2_tcap
+usr/lib/llc2/llc2_tparser
--- a/usr/src/cmd/Makefile	Sun Aug 15 23:46:06 2010 -0700
+++ b/usr/src/cmd/Makefile	Mon Aug 16 16:22:01 2010 -0700
@@ -458,7 +458,6 @@
 $(CLOSED_BUILD)COMMON_SUBDIRS += \
 	$(CLOSED)/cmd/iconv	\
 	$(CLOSED)/cmd/ksh	\
-	$(CLOSED)/cmd/llc2	\
 	$(CLOSED)/cmd/localedef	\
 	$(CLOSED)/cmd/more_xpg4	\
 	$(CLOSED)/cmd/mtst	\
@@ -742,7 +741,6 @@
 $(CLOSED_BUILD)MSGSUBDIRS += \
 	$(CLOSED)/cmd/iconv	\
 	$(CLOSED)/cmd/ksh	\
-	$(CLOSED)/cmd/llc2	\
 	$(CLOSED)/cmd/localedef	\
 	$(CLOSED)/cmd/more_xpg4	\
 	$(CLOSED)/cmd/od	\
--- a/usr/src/pkg/manifests/SUNWllc.mf	Sun Aug 15 23:46:06 2010 -0700
+++ b/usr/src/pkg/manifests/SUNWllc.mf	Mon Aug 16 16:22:01 2010 -0700
@@ -23,7 +23,8 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/SUNWllc@0.5.11,5.11-0.133
-set name=pkg.renamed value=true
+# Was renamed to driver/network/llc2, both now obsolete
+
+set name=pkg.fmri value=pkg:/SUNWllc@$(PKGVERS)
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-depend fmri=pkg:/driver/network/llc2@0.5.11,5.11-0.133 type=require
--- a/usr/src/pkg/manifests/driver-network-llc2.mf	Sun Aug 15 23:46:06 2010 -0700
+++ b/usr/src/pkg/manifests/driver-network-llc2.mf	Mon Aug 16 16:22:01 2010 -0700
@@ -23,64 +23,6 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#
-# The default for payload-bearing actions in this package is to appear in the
-# global zone only.  See the include file for greater detail, as well as
-# information about overriding the defaults.
-#
-<include global_zone_only_component>
 set name=pkg.fmri value=pkg:/driver/network/llc2@$(PKGVERS)
-set name=pkg.description \
-    value="LLC2 driver implementing IEEE 802.2 Logical Link Control 2 service"
-set name=pkg.summary value="LLC2 driver and its initialization programs"
-set name=info.classification \
-    value=org.opensolaris.category.2008:Drivers/Networking
+set name=pkg.obsolete value=true
 set name=variant.arch value=$(ARCH)
-dir path=etc group=sys
-dir path=etc/init.d group=sys
-dir path=etc/llc2 group=sys
-dir path=etc/llc2/default group=sys
-dir path=etc/rc0.d group=sys
-dir path=etc/rc1.d group=sys
-dir path=etc/rc2.d group=sys
-dir path=etc/rcS.d group=sys
-dir path=usr group=sys
-dir path=usr/include
-dir path=usr/include/sys
-dir path=usr/kernel group=sys
-dir path=usr/kernel/drv group=sys
-dir path=usr/kernel/drv/$(ARCH64) group=sys
-dir path=usr/lib
-dir path=usr/lib/llc2
-driver name=llc2 perms="* 0666 root sys"
-file path=etc/init.d/llc2 group=sys mode=0744 \
-    original_name=SUNWllc:etc/init.d/llc2 preserve=true
-file path=etc/llc2/llc2_start.default group=sys mode=0744
-file path=usr/kernel/drv/$(ARCH64)/llc2 group=sys
-$(i386_ONLY)file path=usr/kernel/drv/llc2 group=sys
-file path=usr/kernel/drv/llc2.conf group=sys
-file path=usr/lib/llc2/llc2_autoconfig mode=0555
-file path=usr/lib/llc2/llc2_config mode=0555
-file path=usr/lib/llc2/llc2_loop2 mode=0555
-file path=usr/lib/llc2/llc2_loop3 mode=0555
-file path=usr/lib/llc2/llc2_loop4 mode=0555
-file path=usr/lib/llc2/llc2_stats mode=0555
-file path=usr/lib/llc2/llc2_tcap mode=0555
-file path=usr/lib/llc2/llc2_tparser mode=0555
-hardlink path=etc/rc0.d/K52llc2 target=../../etc/init.d/llc2
-hardlink path=etc/rc1.d/K52llc2 target=../../etc/init.d/llc2
-hardlink path=etc/rc2.d/S40llc2 target=../../etc/init.d/llc2
-hardlink path=etc/rcS.d/K52llc2 target=../../etc/init.d/llc2
-legacy pkg=SUNWllc arch=$(ARCH) category=system \
-    desc="LLC2 driver implementing IEEE 802.2 Logical Link Control 2 service" \
-    hotline="Please contact your local service provider" \
-    name="LLC2 driver and its initialization programs" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-legacy pkg=SUNWllcr arch=$(ARCH) category=system \
-    desc="The configuration and startup files for llc2 driver" \
-    hotline="Please contact your local service provider" \
-    name="LLC2 driver configuration and startup files" \
-    vendor="Sun Microsystems, Inc." version=11.11,REV=2009.11.11
-license cr_Sun license=cr_Sun
-license lic_OSBL license=lic_OSBL
-license lic_OSBL_preamble license=lic_OSBL_preamble
--- a/usr/src/uts/intel/Makefile.intel.shared	Sun Aug 15 23:46:06 2010 -0700
+++ b/usr/src/uts/intel/Makefile.intel.shared	Mon Aug 16 16:22:01 2010 -0700
@@ -370,7 +370,6 @@
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= glm
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= intel_nhmex
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= iprb
-$(CLOSED_BUILD)CLOSED_DRV_KMODS		+= llc2
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= cpqary3
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= marvell88sx
 $(CLOSED_BUILD)CLOSED_DRV_KMODS		+= bcm_sata
--- a/usr/src/uts/sparc/Makefile.sparc.shared	Sun Aug 15 23:46:06 2010 -0700
+++ b/usr/src/uts/sparc/Makefile.sparc.shared	Mon Aug 16 16:22:01 2010 -0700
@@ -233,7 +233,6 @@
 
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= glm
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= isp
-$(CLOSED_BUILD)CLOSED_DRV_KMODS	+= llc2
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= mpt
 $(CLOSED_BUILD)CLOSED_DRV_KMODS += qus
 $(CLOSED_BUILD)CLOSED_DRV_KMODS	+= se