From: John P. Davis <zhen@gentoo.org>
Date: Fri, 13 Feb 2004 05:23:20 +0000 (+0000)
Subject: sparc fixups
X-Git-Tag: CATALYST_1_0_1~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0656d5eac06bd976530d98fab295e803d445e29;p=catalyst.git

sparc fixups


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@224 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/ChangeLog b/ChangeLog
index d206b048..c52c6722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.18 2004/02/13 02:41:26 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.19 2004/02/13 05:23:20 zhen Exp $
+
+  13 Feb 2004; John Davis <zhen@gentoo.org> sparc64-isogen.sh, arch/sparc.py,
+  arch/sparc64.py, examples/livecd/runscript/sparc64-archscript.sh,
+  examples/livecd/sparc64/config-2.4.24-sparc64:
+  sparc fixups contributed by Gustavo Zacarias <gustavoz@gentoo.org>
 
   12 Feb 2004; Daniel Robbins <drobbins@gentoo.org>: fixed bugs in previous
   feature additions (see 11 Feb 2004) and added support for a $clst_conf 
diff --git a/arch/sparc.py b/arch/sparc.py
index a401f746..a61caa01 100644
--- a/arch/sparc.py
+++ b/arch/sparc.py
@@ -15,7 +15,7 @@ class arch_sparc(generic_sparc):
 	"builder class for generic sparc (sun4cdm)"
 	def __init__(self,myspec):
 		generic_sparc.__init__(self,myspec)
-		self.settings["CFLAGS"]=" -O2"
+		self.settings["CFLAGS"]="-O2"
 		self.settings["CHOST"]="sparc-unknown-linux-gnu"
 
 def register(foo):
diff --git a/arch/sparc64.py b/arch/sparc64.py
index 3cc72452..e6f71da2 100644
--- a/arch/sparc64.py
+++ b/arch/sparc64.py
@@ -15,7 +15,7 @@ class arch_sparc64(generic_sparc64):
 	"builder class for generic sparc64 (sun4u)"
 	def __init__(self,myspec):
 		generic_sparc64.__init__(self,myspec)
-		self.settings["CFLAGS"]=" -O3 -mcpu=ultrasparc"
+		self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc"
 		self.settings["CHOST"]="sparc-unknown-linux-gnu"
 
 def register(foo):
diff --git a/examples/livecd/runscript/sparc64-archscript.sh b/examples/livecd/runscript/sparc64-archscript.sh
index 7d83234e..6f6b157a 100644
--- a/examples/livecd/runscript/sparc64-archscript.sh
+++ b/examples/livecd/runscript/sparc64-archscript.sh
@@ -1,20 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/sparc64-archscript.sh,v 1.3 2004/01/26 18:15:50 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/sparc64-archscript.sh,v 1.4 2004/02/13 05:23:20 zhen Exp $
 
 case $1 in
 	kernel)
 		genkernel_args=""
 		export genkernel_args
-		exit $RETURN_CONTINUE
 	;;
 
 	preclean)
-		exit $RETURN_CONTINUE
 	;;
 
 	clean)
-		exit $RETURN_CONTINUE
 	;;
 
 	bootloader)
@@ -40,12 +37,12 @@ case $1 in
 				#grab name of first kernel
 				first="$x"
 			fi
-			if [ ! -e "/tmp/binaries/$x.tar.bz2" ] 
+			if [ ! -e "$clst_chroot_path/tmp/binaries/$x.tar.bz2" ] 
 			then
-				echo "Can't find kernel tarball at /tmp/binaries/$x.tar.bz2"
+				echo "Can't find kernel tarball at $clst_chroot_path/tmp/binaries/$x.tar.bz2"
 				exit 1
 			fi
-			tar xjvf /tmp/binaries/$x.tar.bz2 -C \
+			tar xjvf $clst_chroot_path/tmp/binaries/$x.tar.bz2 -C \
 			    $clst_cdroot_path/boot
 			# change kernel name from "kernel" to "gentoo", for
 			# example
@@ -77,19 +74,15 @@ case $1 in
 
 		echo "image=\"cat /boot/silo.conf\"" >> $scfg
 		echo -e "label=\"config\"" >> $scfg
-		exit $RETURN_CONTINUE
 	;;
 
 	cdfs)
-		exit $RETURN_CONTINUE
 	;;
 
 	iso)
 		# this is for the livecd-final target, and calls the proper
 		# command to build the iso file
-		mkisofs -J -R -l -o ${clst_iso_path} -G /boot/isofs.b -B ... \
+		mkisofs -J -R -l -z -o ${clst_iso_path} -G /boot/isofs.b -B ... \
 		    $clst_cdroot_path
-		exit $RETURN_GOOD
 	;;
 esac
-exit $RETURN_CONTINUE
diff --git a/examples/livecd/sparc64/config-2.4.24-sparc64 b/examples/livecd/sparc64/config-2.4.24-sparc64
index 171d4a1b..216c0243 100644
--- a/examples/livecd/sparc64/config-2.4.24-sparc64
+++ b/examples/livecd/sparc64/config-2.4.24-sparc64
@@ -91,6 +91,12 @@ CONFIG_PROM_CONSOLE=y
 #
 CONFIG_FB=y
 CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_LOGO_TUX is not set
+# CONFIG_FB_LOGO_LARRY is not set
+# CONFIG_FB_LOGO_GENTOO is not set
+CONFIG_FB_LOGO_G=y
+# CONFIG_FB_LOGO_PENGUIN is not set
+# CONFIG_FB_LOGO_POWEREDBY is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_FB_CLGEN is not set
 # CONFIG_FB_PM2 is not set
@@ -564,7 +570,7 @@ CONFIG_TMPFS=y
 CONFIG_RAMFS=y
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
+CONFIG_ZISOFS=y
 # CONFIG_JFS_FS is not set
 # CONFIG_JFS_DEBUG is not set
 # CONFIG_JFS_STATISTICS is not set
@@ -614,7 +620,7 @@ CONFIG_NCPFS_OS2_NS=y
 CONFIG_NCPFS_SMALLDOS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_EXTRAS=y
-# CONFIG_ZISOFS_FS is not set
+CONFIG_ZISOFS_FS=y
 
 #
 # Partition Types
@@ -872,3 +878,8 @@ CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 # CONFIG_FW_LOADER is not set
+
+#
+# Grsecurity
+#
+# CONFIG_GRKERNSEC is not set
diff --git a/sparc64-isogen.sh b/sparc64-isogen.sh
index 0645c3d4..736f0f6b 100755
--- a/sparc64-isogen.sh
+++ b/sparc64-isogen.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-mkisofs -J -R -l -o ../gentoo.iso  -G /boot/isofs.b -B ... .
+mkisofs -J -R -z -l -o ../gentoo.iso  -G /boot/isofs.b -B ... .