From: John P. Davis Date: Sat, 22 May 2004 00:42:59 +0000 (+0000) Subject: sparc fixup patches X-Git-Tag: CATALYST_2_0_6_916~992 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5427363974eca7ca3b691c288db4c62dc63ce45a;p=catalyst.git sparc fixup patches git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@381 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index a982d400..764753e7 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.52 2004/05/20 21:16:56 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.53 2004/05/22 00:42:59 zhen Exp $ + + 21 May 2004; John Davis arch/sparc.py, arch/sparc64.py, + livecd/runscript/sparc-archscript.sh, + livecd/runscript/sparc64-archscript.sh: + sparc fixup patches from gustavoz at g.org 20 May 2004; John Davis modules/livecd_stage2_target.py: added support for blacklisting modules via hotplug in livecd-stage2. spec key diff --git a/arch/sparc.py b/arch/sparc.py index dd14adf0..646c7f2e 100644 --- a/arch/sparc.py +++ b/arch/sparc.py @@ -21,6 +21,7 @@ class arch_sparc(generic_sparc): def __init__(self,myspec): generic_sparc.__init__(self,myspec) self.settings["CFLAGS"]="-O2" + self.settings["CXXFLAGS"]="-O2" self.settings["CHOST"]="sparc-unknown-linux-gnu" def register(foo): diff --git a/arch/sparc64.py b/arch/sparc64.py index e6f71da2..58ed48e8 100644 --- a/arch/sparc64.py +++ b/arch/sparc64.py @@ -16,6 +16,7 @@ class arch_sparc64(generic_sparc64): def __init__(self,myspec): generic_sparc64.__init__(self,myspec) self.settings["CFLAGS"]="-O2 -mcpu=ultrasparc" + self.settings["CXXFLAGS"]="-O2 -mcpu=ultrasparc" self.settings["CHOST"]="sparc-unknown-linux-gnu" def register(foo): diff --git a/livecd/runscript/sparc-archscript.sh b/livecd/runscript/sparc-archscript.sh index 3b9cc178..5e7031d2 100644 --- a/livecd/runscript/sparc-archscript.sh +++ b/livecd/runscript/sparc-archscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.2 2004/05/17 01:44:37 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.3 2004/05/22 00:42:59 zhen Exp $ case $1 in kernel) @@ -52,15 +52,9 @@ case $1 in $clst_cdroot_path/boot/$x.igz done scfg=$clst_cdroot_path/boot/silo.conf - kmsg=$clst_cdroot_path/boot/kernels.msg - hmsg=$clst_cdroot_path/boot/help.msg - echo "default=\"$first\"" > $scfg - echo "timeout=\"150\"" >> $scfg + echo "default=\"help\"" > $scfg echo "message=\"/boot/boot.msg\"" >> $scfg - echo "Available kernels:" > $kmsg - echo "TEST HELP MESSAGE" > $hmsg - for x in $clst_boot_kernel do echo >> $icfg @@ -72,6 +66,10 @@ case $1 in echo "image=\"cat /boot/silo.conf\"" >> $scfg echo -e "label=\"config\"" >> $scfg + echo "image=\"cat /boot/video.msg\"" >> $scfg + echo -e "label=\"video\"" >> $scfg + echo "image=\"cat /boot/help.msg\"" >> $scfg + echo -e "label=\"help\"" >> $scfg ;; cdfs) @@ -80,6 +78,6 @@ case $1 in iso) # this is for the livecd-final target, and calls the proper # command to build the iso file - mkisofs -J -R -l -o ${2} -G /boot/isofs.b -B ... ${clst_cdroot_path} + mkisofs -J -R -l -o ${2} -G ${clst_cdroot_path}/boot/isofs.b -B ... ${clst_cdroot_path} ;; esac diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh index 17bb4f21..f14b2a15 100644 --- a/livecd/runscript/sparc64-archscript.sh +++ b/livecd/runscript/sparc64-archscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.3 2004/05/17 01:44:37 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.4 2004/05/22 00:42:59 zhen Exp $ case $1 in kernel) @@ -52,15 +52,9 @@ case $1 in $clst_cdroot_path/boot/$x.igz done scfg=$clst_cdroot_path/boot/silo.conf - kmsg=$clst_cdroot_path/boot/kernels.msg - hmsg=$clst_cdroot_path/boot/help.msg - echo "default=\"$first\"" > $scfg - echo "timeout=\"150\"" >> $scfg + echo "default=\"help\"" > $scfg echo "message=\"/boot/boot.msg\"" >> $scfg - echo "Available kernels:" > $kmsg - echo "TEST HELP MESSAGE" > $hmsg - for x in $clst_boot_kernel do echo >> $icfg @@ -72,6 +66,10 @@ case $1 in echo "image=\"cat /boot/silo.conf\"" >> $scfg echo -e "label=\"config\"" >> $scfg + echo "image=\"cat /boot/video.msg\"" >> $scfg + echo -e "label=\"video\"" >> $scfg + echo "image=\"cat /boot/help.msg\"" >> $scfg + echo -e "label=\"help\"" >> $scfg ;; cdfs) @@ -80,6 +78,6 @@ case $1 in iso) # this is for the livecd-final target, and calls the proper # command to build the iso file - mkisofs -J -R -l -z -o ${2} -G /boot/isofs.b -B ... ${clst_cdroot_path} + mkisofs -J -R -l -z -o ${2} -G ${clst_cdroot_path}/boot/isofs.b -B ... ${clst_cdroot_path} ;; esac