Fixed new cbuild code with another patch from Mike Frysinger <vapier@gentoo.org>...

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

diff --git a/ChangeLog b/ChangeLog
index beaa59ad59ef9c9da87e3a9949ce89bc1c98564a..1a042a4aa01a88033962e5c14b3155142ef6f716 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  23 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py:
+  Fixed new cbuild code with another patch from Mike Frysinger
+  <vapier@gentoo.org> to allow the usage of subarches.
+
   09 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> arch/alpha.py,
   arch/amd64.py, arch/arm.py, arch/hppa.py, arch/ia64.py, arch/mips.py,
   arch/ppc.py, arch/ppc64.py, arch/s390.py, arch/sh.py, arch/sparc.py,

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 1bd15997bf843798d74b999208e72698170d44d4..d70ee716ea84b01fd005c627535b20a1e9387328 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -57,11 +57,14 @@ class generic_stage_target(generic_target):
                
                if self.settings.has_key("chost"):
                        hostmachine = self.settings["chost"].split("-")[0]
+                       if not machinemap.has_key(hostmachine):
+                               raise CatalystError, "Unknown host machine type "+hostmachine
+                       self.settings["hostarch"] = machinemap[hostmachine]
                else:
-                       hostmachine = os.uname()[4]
-               if not machinemap.has_key(hostmachine):
-                       raise CatalystError, "Unknown host machine type "+hostmachine
-               self.settings["hostarch"] = machinemap[hostmachine]
+                       hostmachine = self.settings["subarch"]
+                       if machinemap.has_key(hostmachine):
+                               hostmachine = machinemap[hostmachine]
+                       self.settings["hostarch"] = hostmachine
                if self.settings.has_key("cbuild"):
                        buildmachine = self.settings["cbuild"].split("-")[0]
                else: