Merging in changes from default-1.0.

Fixes for generate-packages.sh and build-cd.sh.

Fixes for packages.cd and kernel-config.

6 files changed, 21 insertions, 13 deletions

diff --git a/profiles/default-sparc-1.0/boot/kernel-config b/profiles/default-sparc-1.0/boot/kernel-config
index ccf33334316e..87fd1cfc2a1b 100644
--- a/profiles/default-sparc-1.0/boot/kernel-config
+++ b/profiles/default-sparc-1.0/boot/kernel-config
@@ -125,9 +125,9 @@ CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SUNLANCE=y
-CONFIG_HAPPYMEAL=m
+CONFIG_HAPPYMEAL=y
 CONFIG_SUNBMAC=m
-CONFIG_SUNQE=m
+CONFIG_SUNQE=y
 CONFIG_MYRI_SBUS=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
diff --git a/profiles/default-sparc-1.0/make.defaults b/profiles/default-sparc-1.0/make.defaults
index 8e868e47f047..ee21fc00d534 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 Tue May  7 02:46:03 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Wed May  8 02:53:09 CEST 2002
 
 # Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
 # System-wide defaults for the Portage system
@@ -12,11 +12,15 @@ slang  spell ssl svga tcltk tcpd truetype X xml2 xmms xv"
 
 # These lines added by scripts/generate-packages.sh
 #
-# $Id: make.defaults,v 1.6 2002/05/07 01:20:52 murphy Exp $
+# $Id: make.defaults,v 1.7 2002/05/08 01:23:04 murphy Exp $
 #
 # $Log: make.defaults,v $
-# Revision 1.6  2002/05/07 01:20:52  murphy
-# CD scripts
+# Revision 1.7  2002/05/08 01:23:04  murphy
+# Merging in changes from default-1.0.
+#
+# Fixes for generate-packages.sh and build-cd.sh.
+#
+# Fixes for packages.cd and kernel-config.
 #
 # 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 599a0592bd94..94ba241cbb08 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 Tue May  7 02:46:03 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Wed May  8 02:53: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.1.0-r2
+<x11-base/xfree-4.2.0
 
 # 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.7 2002/05/07 03:38:36 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.8 2002/05/08 01:23:04 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/packages.cd b/profiles/default-sparc-1.0/packages.cd
index 302acd9bfb40..c8a586d7318c 100644
--- a/profiles/default-sparc-1.0/packages.cd
+++ b/profiles/default-sparc-1.0/packages.cd
@@ -11,5 +11,6 @@ sys-apps/grep
 sys-apps/bzip2
 sys-apps/gzip
 sys-apps/textutils
+sys-apps/sh-utils
 app-editors/levee
 app-editors/nano
diff --git a/profiles/default-sparc-1.0/scripts/build-cd.sh b/profiles/default-sparc-1.0/scripts/build-cd.sh
index ffe6930a0a02..8c26809fa301 100644
--- a/profiles/default-sparc-1.0/scripts/build-cd.sh
+++ b/profiles/default-sparc-1.0/scripts/build-cd.sh
@@ -172,8 +172,9 @@ copy_files() {
 		egrep -v ':dir ' |egrep -v 'MAKEDEV' | awk '{print $2}' | \
 		egrep -v '(/[.]keep$|/usr/src)' > ${TEMP}/filelist
 
-	find /usr/share/terminfo -name vt\* -o -name linux -o -name sun\* -o \
-							-name \*onsole\* -o -name xterm >> ${TEMP}/filelist
+	#find /usr/share/terminfo -name vt\* -o -name linux -o -name sun\* -o \
+							#-name \*onsole\* -o -name xterm >> ${TEMP}/filelist
+	find /usr/share/terminfo -type f |egrep -v 'pmconsole' >> ${TEMP}/filelist
 	tar -c --numeric-owner -T ${TEMP}/filelist -f - | ( cd $TO; tar xf - )
 	
 	# Copy the libraries we need
@@ -503,6 +504,7 @@ create_root() {
 }
 
 create_cd() {
+	chown -Rh root:root ${CDROOT}
 	cd ${CDROOT}
 	cp $USE_RAMDISK boot
 	mkisofs.debian -v -r -S boot/cd.b -s ${SILOCONFOUT} -o ${CDOUT} .
diff --git a/profiles/default-sparc-1.0/scripts/generate-packages.sh b/profiles/default-sparc-1.0/scripts/generate-packages.sh
index 65cdcaec9831..8a18b876764b 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.6 2002/04/20 17:00:41 murphy Exp $
+# $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 $
 #
 # New packages file
 NEWPACKAGESBUILD=packages.build
@@ -34,7 +34,8 @@ echo "" >> $NEWPACKAGES
 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:=linux-headers-2.4.18:~linux-headers-2.4.18:' \
+	-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_