6406742 need to remove SUNW,OPL-Enterprise platform links

9 files changed, 14 insertions, 41 deletions

diff --git a/usr/src/cmd/dcs/sparc/sun4u/svc-dcs b/usr/src/cmd/dcs/sparc/sun4u/svc-dcs
index 52e0897ef7..e835ab8a22 100644
--- a/usr/src/cmd/dcs/sparc/sun4u/svc-dcs
+++ b/usr/src/cmd/dcs/sparc/sun4u/svc-dcs
@@ -50,24 +50,18 @@ platform=`/sbin/uname -i`
 e10k="SUNW,Ultra-Enterprise-10000"
 sf15k="SUNW,Sun-Fire-15000"
 opl="SUNW,SPARC-Enterprise"
-fjopl="FJSV,SPARC-Enterprise"
-tmpopl="SUNW,OPL-Enterprise"
 
 args=""
 if [ $platform = "$sf15k" ]; then
 	args="$args `getproparg -a dcs/ah_auth`"
 	args="$args `getproparg -e dcs/esp_encr`"
 	args="$args `getproparg -u dcs/esp_auth`"
-elif [ $platform = "$opl" -o \
-       $platform = "$fjopl" -o \
-       $platform = "$tmpopl" ]; then
+elif [ $platform = "$opl" ]; then
 	args="-l"
 fi
 
 if [ $platform = "$e10k" -o $platform = "$sf15k" -o \
-     $platform = "$opl" -o \
-     $platform = "$fjopl" -o \
-     $platform = "$tmpopl" ]; then
+     $platform = "$opl" ]; then
 	$DCS $args			# Fail if can't execute
 	exit				# Use dcs's exit status
 else
diff --git a/usr/src/cmd/sckmd/svc-sckmd b/usr/src/cmd/sckmd/svc-sckmd
index 99f81a0b3e..4261c7c849 100644
--- a/usr/src/cmd/sckmd/svc-sckmd
+++ b/usr/src/cmd/sckmd/svc-sckmd
@@ -35,14 +35,10 @@
 platform=${_INIT_UTS_PLATFORM:-`/sbin/uname -i`}
 starcat="SUNW,Sun-Fire-15000" 
 opl="SUNW,SPARC-Enterprise" 
-fjopl="FJSV,SPARC-Enterprise" 
-tmpopl="SUNW,OPL-Enterprise" 
 sckmd="/usr/platform/sun4u/lib/sckmd"
 
 if [ ${platform} = "${starcat}" -o  \
-     ${platform} = "${opl}" -o \
-     ${platform} = "${fjopl}" -o \
-     ${platform} = "${tmpopl}" ]; then
+     ${platform} = "${opl}" ]; then
 	if [ -x ${sckmd} ]; then 
 		${sckmd}
 		exit $SMF_EXIT_OK
diff --git a/usr/src/lib/libdscp/svc/svc-dscp b/usr/src/lib/libdscp/svc/svc-dscp
index f8f79e81a2..afb282d496 100644
--- a/usr/src/lib/libdscp/svc/svc-dscp
+++ b/usr/src/lib/libdscp/svc/svc-dscp
@@ -33,8 +33,6 @@
 . /lib/svc/share/smf_include.sh
 
 OPL=SUNW,SPARC-Enterprise
-FJOPL=FJSV,SPARC-Enterprise
-TMPOPL=SUNW,OPL-Enterprise
 OPL_LIB=/usr/platform/${OPL}/lib
 DM2S_DEVICE=/dev/dm2s0
 PPP_OPTIONS=${OPL_LIB}/dscp.ppp.options
@@ -47,10 +45,7 @@ PKILL=/bin/pkill
 LD_LIBRARY_PATH=/lib:${OPL_LIB}; export LD_LIBRARY_PATH
 
 # This service can only run on OPL.
-if  [ "${PLATFORM}" != "${OPL}" -a \
-      "${PLATFORM}" != "${FJOPL}" -a \
-      "${PLATFORM}" != "${TMPOPL}" ]; then
-
+if  [ "${PLATFORM}" != "${OPL}" ]; then
 	exit $SMF_EXIT_ERR_CONFIG
 fi
 
diff --git a/usr/src/pkgdefs/SUNWcar.u/prototype_com b/usr/src/pkgdefs/SUNWcar.u/prototype_com
index a38eb7c31f..98216552a8 100644
--- a/usr/src/pkgdefs/SUNWcar.u/prototype_com
+++ b/usr/src/pkgdefs/SUNWcar.u/prototype_com
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -60,8 +60,6 @@ d none platform/SUNW,Netra-T4 755 root sys
 d none platform/SUNW,Netra-CP2300 755 root sys
 d none platform/SUNW,Netra-CP3010 755 root sys
 d none platform/SUNW,SPARC-Enterprise 755 root sys
-s none platform/FJSV,SPARC-Enterprise=SUNW,SPARC-Enterprise
-s none platform/SUNW,OPL-Enterprise=SUNW,SPARC-Enterprise
 d none platform/SUNW,Serverblade1 755 root sys
 d none platform/SUNW,Sun-Blade-100 755 root sys
 d none platform/SUNW,Sun-Blade-1000 755 root sys
diff --git a/usr/src/pkgdefs/SUNWkvm.u/prototype_com b/usr/src/pkgdefs/SUNWkvm.u/prototype_com
index 78a6301b0b..696324ce79 100644
--- a/usr/src/pkgdefs/SUNWkvm.u/prototype_com
+++ b/usr/src/pkgdefs/SUNWkvm.u/prototype_com
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -51,8 +51,6 @@ d none usr/platform/sun4u-opl 755 root sys
 # other platform directories
 #
 d none usr/platform/SUNW,SPARC-Enterprise 755 root sys
-s none usr/platform/FJSV,SPARC-Enterprise=SUNW,SPARC-Enterprise
-s none usr/platform/SUNW,OPL-Enterprise=SUNW,SPARC-Enterprise
 d none usr/platform/SUNW,Ultra-2 755 root sys
 d none usr/platform/SUNW,Ultra-250 755 root sys
 d none usr/platform/SUNW,Ultra-4 755 root sys
diff --git a/usr/src/pkgdefs/common_files/i.ttydefs b/usr/src/pkgdefs/common_files/i.ttydefs
index 6c3d316527..94c87960ed 100644
--- a/usr/src/pkgdefs/common_files/i.ttydefs
+++ b/usr/src/pkgdefs/common_files/i.ttydefs
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-#       ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -44,10 +44,7 @@ do
       PLATFORM_TOKEN=`uname -i`
       case "$PLATFORM_TOKEN"
       in
-        SUNW,OPL-Enterprise | \
-        SUNW,SPARC-Enterprise | \
-        FJSV,SPARC-Enterprise) 
-
+        SUNW,SPARC-Enterprise)
           # Add the crtscts flag for the console settings
           sed -e "/^console:.*onlcr:/ {
 		 s/onlcr:/onlcr crtscts:/
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index eba3399221..0c6787cafa 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -4791,6 +4791,12 @@ mondo_loop() {
 		$usr/platform/sun4u/include/sys/dr.h	\
 		$usr/platform/sun4u/include/sys/sfdr.h
 
+	# Remove obsolete OPL platform links.
+		rm -f $root/platform/FJSV,SPARC-Enterprise
+		rm -f $root/platform/SUNW,OPL-Enterprise
+		rm -f $usr/platform/FJSV,SPARC-Enterprise
+		rm -f $usr/platform/SUNW,OPL-Enterprise
+
 	# Solstice Enterprise Agent(SEA) : mib-II subagent mibiisa
 	# needs to be disabled during startup. SMA(System Management Agent)
 	# has the capability to support mib-II requests.
diff --git a/usr/src/uts/sun4u/opl/Makefile b/usr/src/uts/sun4u/opl/Makefile
index dc18c8ec61..305d868f43 100644
--- a/usr/src/uts/sun4u/opl/Makefile
+++ b/usr/src/uts/sun4u/opl/Makefile
@@ -70,9 +70,6 @@ lintlib:	unix
 modlintlib:	$(OPL_KMODS)
 
 IMPLEMENTED_PLATFORM	= SUNW,SPARC-Enterprise
-LINKED_PLATFORMS	= FJSV,SPARC-Enterprise
-# temporary link to the development platform name - remove before ON putback!
-LINKED_PLATFORMS	+= SUNW,OPL-Enterprise
 
 # EXPORT DELETE START
 #
@@ -90,8 +87,6 @@ install: $(ROOT_OPL_DIR) $(USR_OPL_DIR) \
 	$(USR_OPL_SBIN_TRAPSTAT) \
 	$(USR_OPL_SBIN_FRUADM) \
 	$(USR_OPL_LIB_DIR) \
-	$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%) \
-	$(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%) \
 	$(OPL_CRYPTO_LINKS) \
 	genassym unix .WAIT $(OPL_CPU_KMODS) $(OPL_KMODS) \
 	$(OPLMSU_OPTION)
diff --git a/usr/src/uts/sun4u/opl/Makefile.targ b/usr/src/uts/sun4u/opl/Makefile.targ
index c24a433d05..d20b6b5c54 100644
--- a/usr/src/uts/sun4u/opl/Makefile.targ
+++ b/usr/src/uts/sun4u/opl/Makefile.targ
@@ -85,12 +85,6 @@ $(USR_OPL_SBIN_TRAPSTAT): $(USR_OPL_SBIN_DIR)
 $(USR_OPL_SBIN_FRUADM): $(USR_OPL_SBIN_DIR)
 	$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
 
-$(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR)
-	$(INS.slink3)
-
-$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR)
-	$(INS.slink3)
-
 $(USR_OPL_LIB_DIR):	$(USR_OPL_DIR) $(USR_PSM_LIB_DIR)
 	-$(INS.dir.root.bin)