From 72c6e8ee2a67483428e91eb83296b2309f1572f7 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 24 Mar 2005 15:37:55 +0000 Subject: [PATCH] Applying arm patch from vapier and closing bug #86466. This is now catalyst 1.1.8, so enjoy. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@569 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- arch/arm.py | 34 ++++++++++++++++++++++++++++----- catalyst | 4 ++-- modules/generic_stage_target.py | 18 ++++++++++------- 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf313793..37e5a017 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.194 2005/03/24 14:17:29 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.195 2005/03/24 15:37:54 wolf31o2 Exp $ + + 24 Mar 2005; Chris Gianelloni arch/arm.py, catalyst, + modules/generic_stage_target.py: + Applying arm patch from vapier and closing bug #86466. This is now catalyst + 1.1.8, so enjoy. 24 Mar 2005; Chris Gianelloni +livecd/files/mkvardb, livecd/runscript/default-runscript.sh, diff --git a/arch/arm.py b/arch/arm.py index 08759b13..76b5fda2 100644 --- a/arch/arm.py +++ b/arch/arm.py @@ -1,12 +1,21 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/arch/arm.py,v 1.3 2004/10/15 02:36:00 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/arch/arm.py,v 1.4 2005/03/24 15:37:55 wolf31o2 Exp $ import builder,os from catalyst_support import * class generic_arm(builder.generic): - "Abstract base class for all arm builders" + "Abstract base class for all arm (little endian) builders" + def __init__(self,myspec): + builder.generic.__init__(self,myspec) + self.settings["mainarch"]="arm" + self.settings["CHROOT"]="chroot" + self.settings["CFLAGS"]="-O2 -pipe" + self.settings["CXXFLAGS"]="-O1 -pipe" + +class generic_armeb(builder.generic): + "Abstract base class for all arm (big endian) builders" def __init__(self,myspec): builder.generic.__init__(self,myspec) self.settings["mainarch"]="arm" @@ -15,11 +24,17 @@ class generic_arm(builder.generic): self.settings["CXXFLAGS"]="-O1 -pipe" class arch_arm(generic_arm): - "Builder class for arm target" + "Builder class for arm (little endian) target" def __init__(self,myspec): generic_arm.__init__(self,myspec) self.settings["CHOST"]="arm-unknown-linux-gnu" +class arch_armeb(generic_armeb): + "Builder class for arm (big endian) target" + def __init__(self,myspec): + generic_armeb.__init__(self,myspec) + self.settings["CHOST"]="armeb-unknown-linux-gnu" + class arch_armv4l(generic_arm): "Builder class for armv4l (StrongArm-110) target" def __init__(self,myspec): @@ -27,9 +42,18 @@ class arch_armv4l(generic_arm): self.settings["CFLAGS"]+=" -mcpu=strongarm110" self.settings["CHOST"]="armv4l-unknown-linux-gnu" +class arch_armv5b(generic_arm): + "Builder class for armv5b (XScale) target" + def __init__(self,myspec): + generic_arm.__init__(self,myspec) + self.settings["CFLAGS"]+=" -mcpu=xscale" + self.settings["CHOST"]="armv5b-unknown-linux-gnu" + def register(foo): "Inform main catalyst program of the contents of this plugin." foo.update({ "arm" : arch_arm, - "armv4l" : arch_armv4l + "armv4l" : arch_armv4l, + "armeb" : arch_armeb, + "armv5b" : arch_armv5b }) diff --git a/catalyst b/catalyst index 0f2edf21..2afed1f5 100755 --- a/catalyst +++ b/catalyst @@ -1,14 +1,14 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.67 2005/03/16 13:51:23 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.68 2005/03/24 15:37:54 wolf31o2 Exp $ # Maintained in full by John Davis import os,sys,imp,string,getopt __maintainer__="Chris Gianelloni " -__version__="1.1.8_pre1" +__version__="1.1.8" conf_values={} diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 7d1ebbba..e7c7561d 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.23 2005/01/10 01:05:59 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.24 2005/03/24 15:37:55 wolf31o2 Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -26,13 +26,14 @@ class generic_stage_target(generic_target): # map the mainarch we are running under to the mainarches we support for # building stages and LiveCDs. (for example, on amd64, we can build stages for # x86 or amd64. - targetmap={ "x86" : ["x86"], + targetmap={ + "x86" : ["x86"], "amd64" : ["x86","amd64"], "sparc64" : ["sparc","sparc64"], "ia64" : ["ia64"], "alpha" : ["alpha"], "sparc" : ["sparc"], - "s390" : ["s390"], + "s390" : ["s390"], "ppc" : ["ppc"], "ppc64" : ["ppc","ppc64"], "hppa" : ["hppa"], @@ -40,7 +41,8 @@ class generic_stage_target(generic_target): "arm" : ["arm"] } - machinemap={ "i386" : "x86", + machinemap={ + "i386" : "x86", "i486" : "x86", "i586" : "x86", "i686" : "x86", @@ -49,7 +51,7 @@ class generic_stage_target(generic_target): "ia64" : "ia64", "alpha" : "alpha", "sparc" : "sparc", - "s390" : "s390", + "s390" : "s390", "ppc" : "ppc", "ppc64" : "ppc64", "parisc" : "hppa", @@ -57,9 +59,11 @@ class generic_stage_target(generic_target): "mips" : "mips", "mips64" : "mips", "arm" : "arm", - "armv4l" : "arm" + "armv4l" : "arm", + "armeb" : "arm", + "armv5b" : "arm" } - + mymachine=os.uname()[4] if not machinemap.has_key(mymachine): raise CatalystError, "Unknown machine type "+mymachine -- 2.26.2