Removing X mask stuff.

More fixes to CD.

5 files changed, 20 insertions, 13 deletions

diff --git a/profiles/default-sparc-1.0/boot/kernel-config b/profiles/default-sparc-1.0/boot/kernel-config
index 4cdfc6e8c8d4..444f6ef21f86 100644
--- a/profiles/default-sparc-1.0/boot/kernel-config
+++ b/profiles/default-sparc-1.0/boot/kernel-config
@@ -9,8 +9,8 @@ CONFIG_VT_CONSOLE=y
 CONFIG_SPARC32=y
 CONFIG_SBUS=y
 CONFIG_SBUSCHAR=y
-CONFIG_BUSMOUSE=y
-CONFIG_SUN_MOUSE=y
+CONFIG_BUSMOUSE=m
+CONFIG_SUN_MOUSE=m
 CONFIG_SERIAL=y
 CONFIG_SUN_SERIAL=y
 CONFIG_SERIAL_CONSOLE=y
@@ -153,8 +153,8 @@ CONFIG_EXT2_FS=y
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 CONFIG_CODA_FS=m
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
+CONFIG_NFS_FS=m
+CONFIG_ROOT_NFS=n
 CONFIG_NFSD=m
 CONFIG_SUNRPC=y
 CONFIG_LOCKD=y
diff --git a/profiles/default-sparc-1.0/make.defaults b/profiles/default-sparc-1.0/make.defaults
index 76f2c3af0e03..9226c2693bd7 100644
--- a/profiles/default-sparc-1.0/make.defaults
+++ b/profiles/default-sparc-1.0/make.defaults
@@ -1,4 +1,4 @@
-# This file created automagically by scripts/generate-packages.sh on Wed May  8 23:38:16 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Sat May 11 03:12:10 CEST 2002
 
 # Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
 # System-wide defaults for the Portage system
@@ -12,9 +12,16 @@ slang spell ssl svga tcpd truetype X xml2 xmms xv"
 
 # These lines added by scripts/generate-packages.sh
 #
-# $Id: make.defaults,v 1.9 2002/05/08 22:08:20 murphy Exp $
+# $Id: make.defaults,v 1.10 2002/05/11 01:40:21 murphy Exp $
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.3  2002/05/08 22:08:22  murphy
+# More fixes to CD stuff.
+#
+# Added more flags to make.defaults.sparc.
+#
+# Regenerated files with the new make.defaults.sparc
+#
 # Revision 1.2  2002/04/18 21:05:52  murphy
 # YMCA: Yet More Changes Ah-ha (tm)
 #
diff --git a/profiles/default-sparc-1.0/packages b/profiles/default-sparc-1.0/packages
index 3fa1c9dff3f4..1a768dbdff0b 100644
--- a/profiles/default-sparc-1.0/packages
+++ b/profiles/default-sparc-1.0/packages
@@ -1,4 +1,4 @@
-# This file created automagically by scripts/generate-packages.sh on Wed May  8 23:38:16 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Sat May 11 03:12:09 CEST 2002
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
@@ -42,7 +42,7 @@
 >=sys-apps/sysklogd-1.4.1
 *dev-lang/python
 
-<x11-base/xfree-4.2.0
+>=x11-base/xfree-4.1.0-r2
 
 # sash - static shell for system recovery
 *app-shells/sash
@@ -169,7 +169,7 @@
 <=sys-apps/tcp-wrappers-7.6-r3
 
 # These lines added by scripts/generate-packages.sh
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.10 2002/05/08 22:08:23 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.11 2002/05/11 01:40:21 murphy Exp $
 #
 # Please edit the file packages.sparc, it will be included in
 # packages the next time you run generate-packages.sh
diff --git a/profiles/default-sparc-1.0/scripts/generate-packages.sh b/profiles/default-sparc-1.0/scripts/generate-packages.sh
index 8a18b876764b..5dd4517cf5a5 100644
--- a/profiles/default-sparc-1.0/scripts/generate-packages.sh
+++ b/profiles/default-sparc-1.0/scripts/generate-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/scripts/generate-packages.sh,v 1.7 2002/05/08 01:23:05 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/scripts/generate-packages.sh,v 1.8 2002/05/11 01:40:21 murphy Exp $
 #
 # New packages file
 NEWPACKAGESBUILD=packages.build
@@ -31,11 +31,11 @@ from_dir=../default-${from_version}
 cp -p $NEWPACKAGES $KEEPPACKAGES
 echo "# This file created automagically by $0 on `date`" > $NEWPACKAGES
 echo "" >> $NEWPACKAGES
+	#-e 's:[^#]*x11-base/xfree.*:<x11-base/xfree-4.2.0:' \
 sed -e 's:.*sys-apps/grub:#*sys-apps/grub:' \
 	-e 's:.*sys-devel/bin86:#*sys-devel/bin86:' \
 	-e 's:.*sys-apps/lilo:#*sys-apps/lilo:' \
 	-e 's:[^#]*sys-kernel/linux-headers.*:~sys-kernel/linux-headers-2.4.18:' \
-	-e 's:[^#]*x11-base/xfree.*:<x11-base/xfree-4.2.0:' \
 	${from_dir}/packages >> $NEWPACKAGES
 cat >> $NEWPACKAGES <<_EOF_
 
diff --git a/profiles/default-sparc-1.0/use.defaults b/profiles/default-sparc-1.0/use.defaults
index 9a8a4b2d5879..96c80c691a32 100644
--- a/profiles/default-sparc-1.0/use.defaults
+++ b/profiles/default-sparc-1.0/use.defaults
@@ -1,9 +1,9 @@
-#3dnow
+3dnow
 #fbcon		
 #ldap
 #libg++
 #mitshm
-#mmx
+mmx
 #objprelink
 #odbc
 #oss