More fixes to CD stuff.

Added more flags to make.defaults.sparc.

Regenerated files with the new make.defaults.sparc

5 files changed, 96 insertions, 23 deletions

diff --git a/profiles/default-sparc-1.0/boot/kernel-config b/profiles/default-sparc-1.0/boot/kernel-config
index 87fd1cfc2a1b..14cb4597c299 100644
--- a/profiles/default-sparc-1.0/boot/kernel-config
+++ b/profiles/default-sparc-1.0/boot/kernel-config
@@ -106,7 +106,7 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_SR_EXTRA_DEVS=2
 CONFIG_CHR_DEV_SG=m
 CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_SUNESP=y
+CONFIG_SCSI_SUNESP=m
 CONFIG_SCSI_QLOGICPTI=m
 CONFIG_FC4=m
 CONFIG_FC4_SOC=m
@@ -125,15 +125,15 @@ CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SUNLANCE=y
-CONFIG_HAPPYMEAL=y
+CONFIG_HAPPYMEAL=m
 CONFIG_SUNBMAC=m
-CONFIG_SUNQE=y
+CONFIG_SUNQE=m
 CONFIG_MYRI_SBUS=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX98_PTY_COUNT=256
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
-CONFIG_REISERFS_FS=y
+CONFIG_REISERFS_FS=m
 CONFIG_REISERFS_PROC_INFO=y
 CONFIG_HFS_FS=m
 CONFIG_EXT3_FS=y
diff --git a/profiles/default-sparc-1.0/make.defaults b/profiles/default-sparc-1.0/make.defaults
index 85b733e9f951..e3298a433fab 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 02:53:09 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Wed May  8 23:38:16 CEST 2002
 
 # Copyright 2000 Daniel Robbins, Gentoo Technologies, Inc.
 # System-wide defaults for the Portage system
@@ -12,24 +12,33 @@ slang spell ssl svga tcpd truetype X xml2 xmms xv"
 
 # These lines added by scripts/generate-packages.sh
 #
-# $Id: make.defaults,v 1.8 2002/05/08 21:08:49 drobbins Exp $
+# $Id: make.defaults,v 1.9 2002/05/08 22:08:20 murphy Exp $
 #
 # $Log: make.defaults,v $
-# Revision 1.8  2002/05/08 21:08:49  drobbins
-# turning "tcltk" off by default as it causes python to pull in X during
-# initial "emerge system" -- non-optimal for servers.  tcltk is now an
-# auto-use.
+# Revision 1.9  2002/05/08 22:08:20  murphy
+# More fixes to CD stuff.
 #
-# Revision 1.7  2002/05/08 01:23:04  murphy
-# Merging in changes from default-1.0.
+# Added more flags to make.defaults.sparc.
 #
-# Fixes for generate-packages.sh and build-cd.sh.
-#
-# Fixes for packages.cd and kernel-config.
+# 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)
 #
 #
 ARCH="sparc"
+CHOST=sparc-unknown-linux-gnu
+PLATFORM=$CHOST
+
+# Options passed to make during the build process
+# MAKEOPTS="-j2"
+
+# Fetching command (5 tries, passive ftp for firewall compatibility)
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
+# Global configure options
+
+# C Compiler flags
+CFLAGS="-O2 -pipe"
+# C++ Compiler flags
+CXXFLAGS=${CFLAGS}
 # End of lines added by scripts/generate-packages.sh
diff --git a/profiles/default-sparc-1.0/make.defaults.sparc b/profiles/default-sparc-1.0/make.defaults.sparc
index 8f3401519612..d0df13818872 100644
--- a/profiles/default-sparc-1.0/make.defaults.sparc
+++ b/profiles/default-sparc-1.0/make.defaults.sparc
@@ -1,9 +1,30 @@
 #
-# $Id: make.defaults.sparc,v 1.2 2002/04/18 21:05:52 murphy Exp $
+# $Id: make.defaults.sparc,v 1.3 2002/05/08 22:08:22 murphy Exp $
 #
 # $Log: make.defaults.sparc,v $
+# 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)
 #
 #
 ARCH="sparc"
+CHOST=sparc-unknown-linux-gnu
+PLATFORM=$CHOST
+
+# Options passed to make during the build process
+# MAKEOPTS="-j2"
+
+# Fetching command (5 tries, passive ftp for firewall compatibility)
+FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}"
+# Global configure options
+
+# C Compiler flags
+CFLAGS="-O2 -pipe"
+# C++ Compiler flags
+CXXFLAGS=${CFLAGS}
diff --git a/profiles/default-sparc-1.0/packages b/profiles/default-sparc-1.0/packages
index 874db940e8a0..3fa1c9dff3f4 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 02:53:09 CEST 2002
+# This file created automagically by scripts/generate-packages.sh on Wed May  8 23:38:16 CEST 2002
 
 # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later!
 
@@ -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.9 2002/05/08 21:02:13 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.0/packages,v 1.10 2002/05/08 22:08:23 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/build-cd.sh b/profiles/default-sparc-1.0/scripts/build-cd.sh
index 8c26809fa301..fee86f23e667 100644
--- a/profiles/default-sparc-1.0/scripts/build-cd.sh
+++ b/profiles/default-sparc-1.0/scripts/build-cd.sh
@@ -60,12 +60,25 @@ COPYFILES="$@"
 : ${PORTAGE:=/usr/portage}
 : ${PROFILE_SPARC:=$PORTAGE/profiles/default-sparc-1.0}
 : ${PROFILE_SPARC64:=$PORTAGE/profiles/default-sparc64-1.0}
+: ${CDIMAGE_SPARC:=$PORTAGE/profiles/cdimage-sparc}
+: ${CDIMAGE_SPARC64:=$PORTAGE/profiles/cdimage-sparc64}
 : ${USE_RAMDISK:=/boot/ramdisk.gz}
-: ${PACKAGES:=packages.cd}
+: ${PACKAGES:=packages}
 : ${EBUILD_SPARC:=$PROFILE_SPARC/boot/ebuild}
 : ${EBUILD_SPARC64:=$PROFILE_SPARC64/boot/ebuild}
 : ${CONFIG_SPARC:=$PROFILE_SPARC/boot/kernel-config}
 : ${CONFIG_SPARC64:=$PROFILE_SPARC64/boot/kernel-config}
+: ${ARCH_SPARC:=sparc}
+: ${CHOST_SPARC:=sparc-unknown-linux-gnu}
+: ${CFLAGS_SPARC:="-O2 -pipe"}
+: ${CXXFLAGS_SPARC:="-O2 -pipe"}
+: ${PLATFORM_SPARC:=sparc-unknown-linux-gnu}
+: ${ARCH_SPARC64:=sparc64}
+: ${CHOST_SPARC64:=sparc-unknown-linux-gnu}
+: ${CFLAGS_SPARC64:="-O2 -pipe"}
+: ${CXXFLAGS_SPARC64:="-O2 -pipe"}
+: ${PLATFORM_SPARC64:=sparc64-unknown-linux-gnu}
+
 # Less likely to be used and still likely to be there
 : ${LOOPDEVICE:=/dev/loop2}
 : ${SILOCONFOUT:=/boot/silo.conf}
@@ -80,6 +93,22 @@ sanity_checks() {
 	fi
 }
 
+emerge_root() {
+
+	TO=$1
+	FROM=$2
+
+	if [ ! -r $FROM ]
+	then
+		echo "$FROM does not exist, barfing"
+		exit 1
+	fi
+
+	ROOT=$TO USE="-* build" ARCH=$MYARCH CHOST=$MYCHOST PLATFORM=$MYPLATFORM \
+	CFLAGS=$MYCFLAGS CXXFLAGS=$MYCXXFLAGS \
+		emerge --noreplace `cat $FROM` || exit 1
+}
+
 baselayout() {
 	TO=$1
 
@@ -355,15 +384,20 @@ buildroot() {
 		sparc64)
 			MYROOT=$ROOT_SPARC64
 			MYCDROOT=${CDROOT}/boot/sparc64
+			MYCDIMAGE=${CDIMAGE_SPARC64}
 			;;
 		sparc)
 			MYROOT=$ROOT_SPARC
 			MYCDROOT=${CDROOT}/boot/sparc
+			MYCDIMAGE=${CDIMAGE_SPARC}
 			;;
 	esac
 
-	copy_files ${KARCH} ${MYROOT}
-	find ${MYROOT} -type f | xargs file| grep "not stripped" | cut -d: -f1| xargs strip
+	#copy_files ${KARCH} ${MYROOT}
+	mkdir -p ${MYROOT}
+	emerge_root ${MYROOT} ${MYCDIMAGE}/${PACKAGES}
+	find ${MYROOT}/bin ${MYROOT}/sbin ${MYROOT}/usr/bin ${MYROOT}/usr/sbin -type f | xargs file| grep "not stripped" | cut -d: -f1| xargs strip
+	find ${MYROOT}/lib ${MYROOT}/usr/lib -type f | xargs file| grep "not stripped" | cut -d: -f1| xargs strip --strip-debug
 	compile_kernel_arch ${KARCH}
 	mkdir -p ${MYCDROOT}
 	copy_kernel ${KARCH} ${MYCDROOT}
@@ -474,8 +508,13 @@ do_sparc() {
 	export PORTAGE_TMPDIR
 	DIR_NAME=`basename $MYEBUILD | sed 's/\.ebuild//'`
 	KERNEL_ROOT=${PORTAGE_TMPDIR}/portage/${DIR_NAME}/work/*
-	buildroot sparc
-	#create_ramdisk $ROOT_SPARC ${CDROOT}/boot/sparc
+	MYARCH=$ARCH_SPARC
+	MYCHOST=$CHOST_SPARC
+	MYPLATFORM=$PLATFORM_SPARC
+	MYCFLAGS=$CFLAGS_SPARC
+	MYCXXFLAGS=$CXXFLAGS_SPARC
+	buildroot $MYARCH
+	#create_ramdisk $ROOT_SPARC ${CDROOT}/boot/$MYARCH
 	SPARC_DISKSIZE=$DISKSIZE
 }
 
@@ -486,6 +525,10 @@ do_sparc64() {
 	export PORTAGE_TMPDIR
 	DIR_NAME=`basename $MYEBUILD | sed 's/\.ebuild//'`
 	KERNEL_ROOT=${PORTAGE_TMPDIR}/portage/${DIR_NAME}/work/*
+	MYARCH=$ARCH_SPARC64
+	MYCHOST=$CHOST_SPARC64
+	MYCFLAGS=$CFLAGS_SPARC64
+	MYCXXFLAGS=$CXXFLAGS_SPARC64
 	buildroot sparc64
 	#create_ramdisk $ROOT_SPARC64 ${CDROOT}/boot/sparc64
 	SPARC64_DISKSIZE=$DISKSIZE