catalyst-use-subarch.patch

   1 Index: modules/generic_stage_target.py
   2 ===================================================================
   3 --- modules/generic_stage_target.py     (revision 1206)
   4 +++ modules/generic_stage_target.py     (working copy)
   5 @@ -57,11 +57,14 @@ class generic_stage_target(generic_targe
   6
   7                 if self.settings.has_key("chost"):
   8                         hostmachine = self.settings["chost"].split("-")[0]
   9 -               else:
  10 -                       hostmachine = os.uname()[4]
  11 -               if not machinemap.has_key(hostmachine):
  12 -                       raise CatalystError, "Unknown host machine type "+hostmachine
  13 -               self.settings["hostarch"] = machinemap[hostmachine]
  14 +                       if not machinemap.has_key(hostmachine):
  15 +                               raise CatalystError, "Unknown host machine type "+hostmachine
  16 +                       self.settings["hostarch"] = machinemap[hostmachine]
  17 +               else:
  18 +                       hostmachine = self.settings["subarch"]
  19 +                       if machinemap.has_key(hostmachine):
  20 +                               hostmachine = machinemap[hostmachine]
  21 +                       self.settings["hostarch"] = hostmachine
  22                 if self.settings.has_key("cbuild"):
  23                         buildmachine = self.settings["cbuild"].split("-")[0]
  24                 else: