Mercurial > illumos > illumos-gate

changeset 9912:ebed7eb11a25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6781712 Removal of Xsun on x86/x64 [PSARC 2008/033]: ON consolidation portion
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
date Fri, 19 Jun 2009 10:07:38 -0700
parents 4e2ae01f57ee
children b5cbbe12c671
files usr/src/cmd/Makefile usr/src/cmd/OWconfig/Makefile usr/src/cmd/OWconfig/OWconfig usr/src/pkgdefs/SUNWos86r/Makefile usr/src/pkgdefs/SUNWos86r/pkginfo.tmpl usr/src/pkgdefs/SUNWos86r/prototype_i386 usr/src/pkgdefs/common_files/i.rOWconfig
diffstat 7 files changed, 3 insertions(+), 249 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/Makefile	Fri Jun 19 08:50:26 2009 -0700
+++ b/usr/src/cmd/Makefile	Fri Jun 19 10:07:38 2009 -0700
@@ -488,7 +488,6 @@
 	diskscan	\
 	lms		\
 	ntfsprogs	\
-	OWconfig	\
 	parted		\
 	rtc		\
 	ucodeadm	\
--- a/usr/src/cmd/OWconfig/Makefile	Fri Jun 19 08:50:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# cmd/OWconfig/Makefile
-
-include ../Makefile.cmd
-
-FILES=	OWconfig
-
-ROOTETC=		$(ROOT)/etc
-OPENWIND=		$(ROOTETC)/openwin
-OPENWINETCD=		$(OPENWIND)/etc
-SERVERD=		$(OPENWIND)/server
-SERVERETCD=		$(SERVERD)/etc
-DEVDATAD=		$(OPENWINETCD)/devdata
-SUNWACCELD=		$(DEVDATAD)/SUNWaccel
-MONITORSD=		$(SUNWACCELD)/monitors
-PDPD=			$(MONITORSD)/pnp
-
-
-DIRS=			\
-	$(ROOTETC)	\
-	$(OPENWIND)	\
-	$(OPENWINETCD)	\
-	$(SERVERD)	\
-	$(SERVERETCD)	\
-	$(DEVDATAD)	\
-	$(SUNWACCELD)	\
-	$(MONITORSD)	\
-	$(PDPD)
-
-FILEMODE=0644
-OWCONFIG=$(FILES:%=$(SERVERETCD)/%)
-
-$(SERVERETCD)/%: %
-	$(INS.file)
-
-
-.KEEP_STATE:
-
-all:
-
-install: all $(DIRS) $(OWCONFIG)
-
-$(DIRS):
-	-$(INS.dir)
-
-clean:
-
-lint:
-
-include ../Makefile.targ
--- a/usr/src/cmd/OWconfig/OWconfig	Fri Jun 19 08:50:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-# Placeholder only - this file will not end up on the system.
--- a/usr/src/pkgdefs/SUNWos86r/Makefile	Fri Jun 19 08:50:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWos86r/Makefile	Fri Jun 19 10:07:38 2009 -0700
@@ -25,7 +25,7 @@
 
 include ../Makefile.com
 
-DATAFILES += i.manifest r.manifest i.rOWconfig
+DATAFILES += i.manifest r.manifest
 
 MACHDATAFILES += i.sdconf
 CLOBBERFILES += $(MACHDATAFILES)
--- a/usr/src/pkgdefs/SUNWos86r/pkginfo.tmpl	Fri Jun 19 08:50:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWos86r/pkginfo.tmpl	Fri Jun 19 10:07:38 2009 -0700
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # This required package information file describes characteristics of the
@@ -45,7 +43,7 @@
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
-CLASSES="none rOWconfig sdconf mach manifest"
+CLASSES="none sdconf mach manifest"
 BASEDIR=/
 SUNW_PKG_ALLZONES="true"
 SUNW_PKG_HOLLOW="true"
--- a/usr/src/pkgdefs/SUNWos86r/prototype_i386	Fri Jun 19 08:50:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWos86r/prototype_i386	Fri Jun 19 10:07:38 2009 -0700
@@ -49,7 +49,6 @@
 i postinstall
 i postremove
 i i.mach
-i i.rOWconfig
 i i.sdconf
 i i.manifest
 i r.manifest
@@ -59,15 +58,6 @@
 d none etc 0755 root sys
 f none etc/bootrc 755 root sys
 e mach etc/mach 644 root sys
-d none etc/openwin 755 root bin
-d none etc/openwin/etc 755 root bin
-d none etc/openwin/etc/devdata 755 root bin
-d none etc/openwin/etc/devdata/SUNWaccel 755 root bin
-d none etc/openwin/etc/devdata/SUNWaccel/monitors 755 root bin
-d none etc/openwin/etc/devdata/SUNWaccel/monitors/pnp 755 root bin
-d none etc/openwin/server 755 root bin
-d none etc/openwin/server/etc 755 root bin
-e rOWconfig etc/openwin/server/etc/OWconfig 644 root bin
 d none kernel 755 root sys
 d none kernel/drv 755 root sys
 f none kernel/drv/sd 755 root sys
--- a/usr/src/pkgdefs/common_files/i.rOWconfig	Fri Jun 19 08:50:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (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
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-
-#
-# $new is the new version of the file in the package. Unused.
-# $old is the old version of the OWconfig file. We rewrite this.
-#
-# We need to rewrite the following:
-#     directory names for PMI files that moved.
-#     Three different cases (x2 - one for vga? and one for 8514)
-#     where SUNW was placed in front of identifier - vga4, vga8, 8514
-#
-
-if [ -h /etc/openwin/server/etc/OWconfig -a -f /tmp/root/etc/openwin/server/etc/OWconfig ]
-then
-	cp /tmp/root/etc/openwin/server/etc/OWconfig $PKG_INSTALL_ROOT/etc/openwin/server/etc/OWconfig
-else
-cat > /tmp/lookup_table <<EOT
-gxe_43.pmi SUNWs3 number9/gxe-2.xqa mfreq/mfreq38.vda 8 ddxSUNWs3.so.1 SUNWs3Init
-gxe_60.pmi SUNWs3 number9/gxe-2.xqa mfreq/mfreq48.vda 8 ddxSUNWs3.so.1 SUNWs3Init
-gxe_70.pmi SUNWs3 number9/gxe-2.xqa mfreq/mfreq56.vda 8 ddxSUNWs3.so.1 SUNWs3Init
-mach32_60.pmi SUNWati ati/ultrapro2.xqa mfreq/mfreq64.vda 8 ddxSUNWati.so.1 SUNWatiInit
-mach32_70.pmi SUNWati ati/ultrapro2.xqa mfreq/mfreq64.vda 8 ddxSUNWati.so.1 SUNWatiInit
-mach32_72.pmi SUNWati ati/ultrapro2.xqa mfreq/mfreq64.vda 8 ddxSUNWati.so.1 SUNWatiInit
-mach32_76.pmi SUNWati ati/ultrapro2.xqa mfreq/mfreq80.vda 8 ddxSUNWati.so.1 SUNWatiInit
-mach32_87.pmi SUNWati ati/ultrapro2.xqa mfreq/mfreq85.vda 8 ddxSUNWati.so.1 SUNWatiInit
-mach32_95.pmi SUNWati ati/ultrapro2.xqa mfreq/mfreq85.vda 8 ddxSUNWati.so.1 SUNWatiInit
-EOT
-
-TMP_FILE=/tmp/`basename $0`.$$
-trap 'rm -f $TMP_FILE /tmp/lookup_table' 0 1 2 3 15
-
-while read new old
-do
-
-#
-# If there is no existing file, don't do any of this stuff.
-# in that case, $old will be /dev/null
-#
-	if [ -f $old ]; then
-		echo "Converting old OWconfig file to new format."
-		cat $old |\
-		   /usr/bin/sed -e 's?vesa/vga?devdata/svpmi/SUNWvga?' \
-                        -e 's?vesa/8514?devdata/svpmi/SUNW8514?' \
-		                -e 's?name=\"vga?name=\"SUNWvga?' \
-		                -e 's?name=\"8514?name=\"SUNW8514?' \
-		                -e 's?listOfScreens=\"vga?listOfScreens=\"SUNWvga?' \
-		                -e 's?device=\"vga?device=\"SUNWvga?' \
-		                -e 's?device=\"8514?device=\"SUNW8514?' \
-		                -e 's?InitFunc=\"vga?InitFunc=\"SUNWvga?' \
-		                -e 's?InitFunc=\"i8514?InitFunc=\"SUNW8514?' \
-                 > /tmp/$$owconfig
-
-/usr/bin/nawk -v LKUP_TBL="/tmp/lookup_table" '
-        BEGIN{
-                while (getline < LKUP_TBL > 0)
-                   tab[$1] = $0		# Read entire lookup table
-                                        # in memory.
-
-             }
-
-        /XINPUT/,/;/ {print}
-
-        /XDISPLAY/,/;/ {print}
-
-        /XSCREENCONFIG/,/;/ { split($0, owcfgflds, " ")
-                              for (i=1; i <= NF; i++)
-                                {
-                                  if (owcfgflds[i] ~ /pmifile/)
-                                   j=split(owcfgflds[i], pmifld, "\"")
-                                }
-				#
-                                # Obtain the pmi filename (eg. ati.pmi)
-                                # from its absolute path.
-                                #
-                                k=split(pmifld[j-1], pmi, "/")
-                                pmifl = pmi[k]
-				#
-                                # If pmifile does not exist in the
-                                # lookup table then do not convert the
-                                # OWconfig file.
-                                #
-                                if (tab[pmifl] == "") {print}
-                                else
-                                {                                        
-                                 split(tab[pmifl], lkupflds, " ")
-                                 dev = lkupflds[2]
-                                 xqa = lkupflds[3]
-                                 vda = lkupflds[4]
-                                 dep = lkupflds[5]
-                                 ddx = lkupflds[6]
-                                 ddi = lkupflds[7]
-
-                                 for (l=1; l <= NF; l++)         
-                                 {               
-                                   if (owcfgflds[l] ~ /pmifile/) owcfgflds[l] = "board=""\""xqa"\" " "monitor=""\""vda"\""
-                                   if (owcfgflds[l] ~ /device/) owcfgflds[l] = "device=""\""dev"\""
-                                   printf "%s ", owcfgflds[l]
-                                 }
-                                 printf "\n"
-				 #
-                                 # Create a new XSCREEN class 
-                                 # corresponding to the modifications
-                                 # made to the XSCREENCONFIG class.
-                                 # Modifying the current XSCREEN class
-				 # is extremely difficult when multiple
-			  	 # instances of the XSCREENCONFIG class
-				 # are present.
-				 # 
-                                 printf "class=\"XSCREEN\" "
-                                 printf "name=\"%s\" ", dev
-                                 printf "ddxHandler=\"%s\" ", ddx
-                                 printf "ddxInitFunc=\"%s\";\n", ddi
-                                }
-                            }
-
-        /XSCREEN"/,/;/ {print}
-
-' /tmp/$$owconfig > $TMP_FILE
-
-		mv $TMP_FILE $old
-		rm -f /tmp/lookup_table
-	else
-		touch $old
-		rm -f $TMP_FILE /tmp/lookup_table
-	fi
-done
-fi
-
-exit 0