diff options
author | ml29623 <none@none> | 2008-01-17 17:35:36 -0800 |
---|---|---|
committer | ml29623 <none@none> | 2008-01-17 17:35:36 -0800 |
commit | 7adfacf32dfbb1d0705cc8a39ffa7fc8a1aeff66 (patch) | |
tree | 2b5d3e828a303c9aa8a2192754f4a005e0bf5631 | |
parent | 142e971fe9419790cf7cebe77a51db0909cb335e (diff) | |
download | illumos-joyent-7adfacf32dfbb1d0705cc8a39ffa7fc8a1aeff66.tar.gz |
6603582 nxge driver excludes i86xpv platform
--HG--
rename : usr/src/pkgdefs/SUNWnxge.i/Makefile => usr/src/pkgdefs/SUNWnxge/Makefile
rename : usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl => usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWnxge.i/postinstall => usr/src/pkgdefs/SUNWnxge/postinstall
rename : usr/src/pkgdefs/SUNWnxge.i/postremove => usr/src/pkgdefs/SUNWnxge/postremove
rename : usr/src/pkgdefs/SUNWnxge.i/prototype_com => usr/src/pkgdefs/SUNWnxge/prototype_com
rename : usr/src/pkgdefs/SUNWnxge.i/prototype_i386 => usr/src/pkgdefs/SUNWnxge/prototype_i386
rename : usr/src/uts/i86pc/nxge/Makefile => usr/src/uts/intel/nxge/Makefile
-rw-r--r-- | usr/src/pkgdefs/Makefile | 2 | ||||
-rwxr-xr-x | usr/src/pkgdefs/SUNWnxge/Makefile (renamed from usr/src/pkgdefs/SUNWnxge.i/Makefile) | 0 | ||||
-rwxr-xr-x | usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl (renamed from usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl) | 4 | ||||
-rwxr-xr-x | usr/src/pkgdefs/SUNWnxge/postinstall (renamed from usr/src/pkgdefs/SUNWnxge.i/postinstall) | 5 | ||||
-rwxr-xr-x | usr/src/pkgdefs/SUNWnxge/postremove (renamed from usr/src/pkgdefs/SUNWnxge.i/postremove) | 0 | ||||
-rw-r--r-- | usr/src/pkgdefs/SUNWnxge/preinstall | 32 | ||||
-rwxr-xr-x | usr/src/pkgdefs/SUNWnxge/prototype_com (renamed from usr/src/pkgdefs/SUNWnxge.i/prototype_com) | 3 | ||||
-rwxr-xr-x | usr/src/pkgdefs/SUNWnxge/prototype_i386 (renamed from usr/src/pkgdefs/SUNWnxge.i/prototype_i386) | 17 | ||||
-rw-r--r-- | usr/src/tools/scripts/bfu.sh | 13 | ||||
-rw-r--r-- | usr/src/uts/i86pc/Makefile | 5 | ||||
-rw-r--r-- | usr/src/uts/i86pc/Makefile.i86pc.shared | 3 | ||||
-rw-r--r-- | usr/src/uts/intel/Makefile.intel.shared | 1 | ||||
-rw-r--r-- | usr/src/uts/intel/nxge/Makefile (renamed from usr/src/uts/i86pc/nxge/Makefile) | 10 |
13 files changed, 69 insertions, 26 deletions
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile index 78193c0db0..1cd100b1f8 100644 --- a/usr/src/pkgdefs/Makefile +++ b/usr/src/pkgdefs/Makefile @@ -130,7 +130,7 @@ i386_SUBDIRS= \ SUNWmv88sx \ SUNWnge \ SUNWnvsata \ - SUNWnxge.i \ + SUNWnxge \ SUNWonmtst.i \ SUNWos86r \ SUNWpsdcr \ diff --git a/usr/src/pkgdefs/SUNWnxge.i/Makefile b/usr/src/pkgdefs/SUNWnxge/Makefile index 896956325b..896956325b 100755 --- a/usr/src/pkgdefs/SUNWnxge.i/Makefile +++ b/usr/src/pkgdefs/SUNWnxge/Makefile diff --git a/usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl b/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl index fbdde5c66b..c0be96a129 100755 --- a/usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl +++ b/usr/src/pkgdefs/SUNWnxge/pkginfo.tmpl @@ -1,5 +1,5 @@ # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # CDDL HEADER START @@ -29,7 +29,7 @@ # PKG="SUNWnxge" NAME="Sun NIU leaf driver" -ARCH="i386.i86pc" +ARCH="ISA" VERSION="ONVERS,REV=0.0.0" SUNW_PRODNAME="SunOS" SUNW_PRODVERS="RELEASE/VERSION" diff --git a/usr/src/pkgdefs/SUNWnxge.i/postinstall b/usr/src/pkgdefs/SUNWnxge/postinstall index a24aaa393e..d7abc0c43b 100755 --- a/usr/src/pkgdefs/SUNWnxge.i/postinstall +++ b/usr/src/pkgdefs/SUNWnxge/postinstall @@ -20,7 +20,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -62,6 +62,9 @@ else ADD_DRV="add_drv -b ${BASEDIR}" fi +removef $PKGINST /platform/i86pc/kernel/drv/nxge.conf >/dev/null 2>&1 +removef -f $PKGINST >/dev/null 2>&1 + # # Make sure add_drv has *not* been previously executed # before attempting to add the driver. diff --git a/usr/src/pkgdefs/SUNWnxge.i/postremove b/usr/src/pkgdefs/SUNWnxge/postremove index 9839cb4cd6..9839cb4cd6 100755 --- a/usr/src/pkgdefs/SUNWnxge.i/postremove +++ b/usr/src/pkgdefs/SUNWnxge/postremove diff --git a/usr/src/pkgdefs/SUNWnxge/preinstall b/usr/src/pkgdefs/SUNWnxge/preinstall new file mode 100644 index 0000000000..b6ffe7409f --- /dev/null +++ b/usr/src/pkgdefs/SUNWnxge/preinstall @@ -0,0 +1,32 @@ +#!/sbin/sh +# +# 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 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "%Z%%M% %I% %E% SMI" +# +if [ -f ${BASEDIR}/platform/i86pc/kernel/drv/nxge.conf ]; then + mv ${BASEDIR}/platform/i86pc/kernel/drv/nxge.conf ${BASEDIR}/kernel/drv/nxge.conf +fi + +exit 0 diff --git a/usr/src/pkgdefs/SUNWnxge.i/prototype_com b/usr/src/pkgdefs/SUNWnxge/prototype_com index f4ed0e1c5e..960b0dcdfd 100755 --- a/usr/src/pkgdefs/SUNWnxge.i/prototype_com +++ b/usr/src/pkgdefs/SUNWnxge/prototype_com @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -38,6 +38,7 @@ i pkginfo i copyright i depend +i preinstall i postinstall i postremove i i.renameold diff --git a/usr/src/pkgdefs/SUNWnxge.i/prototype_i386 b/usr/src/pkgdefs/SUNWnxge/prototype_i386 index 4dd6b94f28..df6bc64cc6 100755 --- a/usr/src/pkgdefs/SUNWnxge.i/prototype_i386 +++ b/usr/src/pkgdefs/SUNWnxge/prototype_i386 @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,18 +42,15 @@ # # # -# List files which are SPARC specific here # # source locations relative to the prototype file # # # SUNWnxge.i # -d none platform 755 root sys -d none platform/i86pc 755 root sys -d none platform/i86pc/kernel 755 root sys -d none platform/i86pc/kernel/drv 755 root sys -f none platform/i86pc/kernel/drv/nxge 755 root sys -e renameold platform/i86pc/kernel/drv/nxge.conf 0644 root sys -d none platform/i86pc/kernel/drv/amd64 755 root sys -f none platform/i86pc/kernel/drv/amd64/nxge 755 root sys +d none kernel 0755 root sys +d none kernel/drv 0755 root sys +f none kernel/drv/nxge 0755 root sys +e renameold kernel/drv/nxge.conf 0644 root sys +d none kernel/drv/amd64 0755 root sys +f none kernel/drv/amd64/nxge 0755 root sys diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh index c86cb80626..8a70cece12 100644 --- a/usr/src/tools/scripts/bfu.sh +++ b/usr/src/tools/scripts/bfu.sh @@ -21,7 +21,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -6957,6 +6957,17 @@ mondo_loop() { fi # + # Remove nxge module (moved to a generic location to support xVM) + # + if [ $target_isa = i386 ]; then + rm -f $root/platform/i86pc/kernel/drv/nxge + rm -f $root/platform/i86pc/kernel/drv/amd64/nxge + # We're doing a backward bfu. + rm -f $root/kernel/drv/nxge + rm -f $root/kernel/drv/amd64/nxge + fi + + # # Remove obsolete librac # rm -f $usr/include/rpc/rac.h diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile index 9659a4c57f..3b6e7b11a6 100644 --- a/usr/src/uts/i86pc/Makefile +++ b/usr/src/uts/i86pc/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -42,10 +42,9 @@ INTEL_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR) INTEL_LINTS = genunix -LINT_PARALLEL_KMODS = $(PARALLEL_KMODS:nxge=) LINT_LIBS = $(LINT_LIB) \ $(GENUNIX_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ - $(LINT_PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ + $(PARALLEL_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(CLOSED_KMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) \ $(INTEL_LINTS:%=$(INTEL_LIB_DIR)/llib-l%.ln) diff --git a/usr/src/uts/i86pc/Makefile.i86pc.shared b/usr/src/uts/i86pc/Makefile.i86pc.shared index 5c41559753..91411508f1 100644 --- a/usr/src/uts/i86pc/Makefile.i86pc.shared +++ b/usr/src/uts/i86pc/Makefile.i86pc.shared @@ -22,7 +22,7 @@ # # uts/i86pc/Makefile.i86pc # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -241,7 +241,6 @@ DRV_KMODS += pcplusmp DRV_KMODS += cpc DRV_KMODS += pci DRV_KMODS += npe -DRV_KMODS += nxge DRV_KMODS += pci-ide DRV_KMODS += xsvc DRV_KMODS += mc-amd diff --git a/usr/src/uts/intel/Makefile.intel.shared b/usr/src/uts/intel/Makefile.intel.shared index d132a3ac5a..d82da0c29e 100644 --- a/usr/src/uts/intel/Makefile.intel.shared +++ b/usr/src/uts/intel/Makefile.intel.shared @@ -263,6 +263,7 @@ DRV_KMODS_32 += mscsi DRV_KMODS_32 += msm DRV_KMODS += nca DRV_KMODS += nv_sata +DRV_KMODS += nxge DRV_KMODS += openeepr DRV_KMODS += pci_pci DRV_KMODS += pcic diff --git a/usr/src/uts/i86pc/nxge/Makefile b/usr/src/uts/intel/nxge/Makefile index a001b6c7f7..fa480ba5e9 100644 --- a/usr/src/uts/i86pc/nxge/Makefile +++ b/usr/src/uts/intel/nxge/Makefile @@ -18,9 +18,9 @@ # # CDDL HEADER END # -# uts/i86pc/nxge/Makefile +# uts/intel/nxge/Makefile # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # @@ -41,13 +41,13 @@ MODULE = nxge NXGE_OBJECTS = $(NXGE_OBJS) $(NXGE_NPI_OBJS) OBJECTS = $(NXGE_OBJECTS:%=$(OBJS_DIR)/%) LINTS = $(NXGE_OBJECTS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) +ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/nxge # # Include common rules. # -include $(UTSBASE)/i86pc/Makefile.i86pc +include $(UTSBASE)/intel/Makefile.intel # # Override defaults to build a unique, local modstubs.o. @@ -121,4 +121,4 @@ install: $(INSTALL_DEPS) # # Include common targets. # -include $(UTSBASE)/i86pc/Makefile.targ +include $(UTSBASE)/intel/Makefile.targ |