From: John P. Davis Date: Wed, 31 Mar 2004 15:18:43 +0000 (+0000) Subject: updated sparc patches X-Git-Tag: CATALYST_2_0_6_916~1043 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3779b5521722047b674b514d41902e2f3a8dd49;p=catalyst.git updated sparc patches git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@330 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index a8351033..51fc033e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # 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.29 2004/03/30 19:45:14 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.30 2004/03/31 15:18:43 zhen Exp $ + + 31 Mar 2004; John Davis arch/sparc.py, modules/targets.py: + sparc compatibility patches from gustavoz@gentoo.org added. These patches add + support for sparc32/64 build compatibility 30 Mar 2004; John Davis livecd/runscript/default-runscript.sh, modules/targets.py, diff --git a/arch/sparc.py b/arch/sparc.py index a61caa01..dd14adf0 100644 --- a/arch/sparc.py +++ b/arch/sparc.py @@ -9,7 +9,12 @@ class generic_sparc(builder.generic): def __init__(self,myspec): builder.generic.__init__(self,myspec) self.settings["mainarch"]="sparc" - self.settings["CHROOT"]="chroot" + if self.settings["hostarch"]=="sparc64": + if not os.path.exists("/usr/bin/sparc32"): + raise CatalystError,"required /usr/bin/sparc32 executable not found (\"emerge sparc-utils\" to fix.)" + self.settings["CHROOT"]="/usr/bin/sparc32 chroot" + else: + self.settings["CHROOT"]="chroot" class arch_sparc(generic_sparc): "builder class for generic sparc (sun4cdm)" diff --git a/modules/targets.py b/modules/targets.py index d10d0912..5fdcfa30 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -1,6 +1,6 @@ # Distributed under the GNU General Public License version 2 # Copyright 2003-2004 Gentoo Technologies, Inc. -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.96 2004/03/30 19:45:14 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.97 2004/03/31 15:18:43 zhen Exp $ import os,string,imp,types,shutil from catalyst_support import * @@ -26,7 +26,7 @@ class generic_stage_target(generic_target): targetmap={ "x86" : ["x86"], "amd64" : ["x86","amd64"], - "sparc64" : ["sparc64"], + "sparc64" : ["sparc","sparc64"], "ia64" : ["ia64"], "alpha" : ["alpha"], "sparc" : ["sparc"],