Added sh architecture to supported architectures. Thanks to Matsuu Takuto <matsuu...

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

diff --git a/AUTHORS b/AUTHORS
index 2f381b2066e32375b977289bf9aa6c6aced8156b..72425e63a881a8d15aea17f3c4d6b603d73ecd5e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,3 +14,4 @@ Gustavo Zacarias <gustavoz@gentoo.org>
 Robert Paskowitz <r2d2@gentoo.org>
 David Bryson <mutex@gentoo.org>
 Daniel Ostrow <dostrow@gentoo.org>
+Matsuu Takuto <matsuu@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index c96e071d357eb02b2d6bc53111cce195c16ad3b3..37365c26c0df896377424ea6cd98b35dae9aaca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.328 2005/09/08 20:59:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.329 2005/09/12 15:31:56 wolf31o2 Exp $
+
+  12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, +arch/sh.py,
+  modules/generic_stage_target.py:
+  Added sh architecture to supported architectures. Thanks to Matsuu Takuto
+  <matsuu@gentoo.org> for the patch. Closing bug #105693.
 
   08 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/livecd-stage1/livecd-stage1-controller.sh,

diff --git a/arch/sh.py b/arch/sh.py
new file mode 100644 (file)
index 0000000..70b683a
--- /dev/null
+++ b/arch/sh.py
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/sh.py,v 1.1 2005/09/12 15:31:57 wolf31o2 Exp $
+
+import builder,os
+from catalyst_support import *
+
+class generic_sh(builder.generic):
+       "Abstract base class for all sh builders [Little-endian]"
+       def __init__(self,myspec):
+               builder.generic.__init__(self,myspec)
+               self.settings["mainarch"]="sh"
+               self.settings["CHROOT"]="chroot"
+
+class generic_sheb(builder.generic):
+       "Abstract base class for all sheb builders [Big-endian]"
+       def __init__(self,myspec):
+               builder.generic.__init__(self,myspec)
+               self.settings["mainarch"]="sh"
+               self.settings["CHROOT"]="chroot"
+
+class arch_sh3(generic_sh):
+       "Builder class for SH-3 [Little-endian]"
+       def __init__(self,myspec):
+               generic_sh.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -m3"
+               self.settings["CHOST"]="sh3-unknown-linux-gnu"
+
+class arch_sh4(generic_sh):
+       "Builder class for SH-4 [Little-endian]"
+       def __init__(self,myspec):
+               generic_sh.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -m4"
+               self.settings["CHOST"]="sh4-unknown-linux-gnu"
+
+class arch_sh3eb(generic_sheb):
+       "Builder class for SH-3 [Big-endian]"
+       def __init__(self,myspec):
+               generic_sheb.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -m3 -mb"
+               self.settings["CHOST"]="sh3eb-unknown-linux-gnu"
+
+class arch_sh4eb(generic_sheb):
+       "Builder class for SH-4 [Big-endian]"
+       def __init__(self,myspec):
+               generic_sheb.__init__(self,myspec)
+               self.settings["CFLAGS"]="-O2 -m4 -mb"
+               self.settings["CHOST"]="sh4eb-unknown-linux-gnu"
+
+def register(foo):
+       "Inform main catalyst program of the contents of this plugin."
+       foo.update({
+                       "sh"    :arch_sh3,
+                       "sh3"   :arch_sh3,
+                       "sh4"   :arch_sh4,
+                       "sheb"  :arch_sh3eb,
+                       "sh3eb" :arch_sh3eb,
+                       "sh4eb" :arch_sh4eb
+       })

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 4c277cbdf6d6e1a2650a265af4efa36004e568b8..b15613abd1dd8016c56f78caaacd02b630f4a8f0 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.57 2005/09/01 15:00:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.58 2005/09/12 15:31:57 wolf31o2 Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -34,6 +34,7 @@ class generic_stage_target(generic_target):
                                "ia64" : ["ia64"],
                                "alpha" : ["alpha"],
                                "sparc" : ["sparc"],
+                               "sh" : ["sh"],
                                "s390" : ["s390"],
                                "ppc" : ["ppc"],
                                "ppc64" : ["ppc","ppc64"],
@@ -52,6 +53,10 @@ class generic_stage_target(generic_target):
                                "ia64" : "ia64",
                                "alpha" : "alpha",
                                "sparc" : "sparc",
+                               "sh3" : "sh",
+                               "sh4" : "sh",
+                               "sh3eb" : "sh",
+                               "sh4eb" : "sh",
                                "s390" : "s390",
                                "ppc" : "ppc",
                                "ppc64" : "ppc64",