look for linux32 in /bin and /usr/bin

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

diff --git a/ChangeLog b/ChangeLog
index 375671f3867a7403abd7aa8143390e82aa4fd763..071d9c2566c600569e4d2c2697c5954368ae86fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  17 Oct 2007; Andrew Gaffney <agaffney@gentoo.org> arch/ppc.py,
+  arch/sparc.py, arch/x86.py:
+  look for linux32 in /bin and /usr/bin
+
   12 Oct 2007; Andrew Gaffney <agaffney@gentoo.org>
   modules/generic_stage_target.py:
   make error message more specific when removing immutable flag

diff --git a/arch/ppc.py b/arch/ppc.py
index e9d843fee97573aae714afdc7c49a87319e675b4..7afd8b06b38d40eef4dc6b74105946a99f9476fd 100644 (file)
--- a/arch/ppc.py
+++ b/arch/ppc.py
@@ -13,8 +13,8 @@ class generic_ppc(builder.generic):
                builder.generic.__init__(self,myspec)
                self.settings["CHOST"]="powerpc-unknown-linux-gnu"
                if self.settings["buildarch"]=="ppc64":
-                       if not os.path.exists("/bin/linux32"):
-                               raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix."
+                       if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
+                               raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
                        self.settings["CHROOT"]="linux32 chroot"
                        self.settings["crosscompile"] = False;
                else:

diff --git a/arch/sparc.py b/arch/sparc.py
index 6804a407cef339898a28b9490b900e319464f6ae..adde6cdb366f53b146170564b1a39e4873c883dd 100644 (file)
--- a/arch/sparc.py
+++ b/arch/sparc.py
@@ -7,8 +7,8 @@ class generic_sparc(builder.generic):
        def __init__(self,myspec):
                builder.generic.__init__(self,myspec)
                if self.settings["buildarch"]=="sparc64":
-                       if not os.path.exists("/bin/linux32"):
-                               raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix.)"
+                       if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
+                               raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
                        self.settings["CHROOT"]="linux32 chroot"
                        self.settings["crosscompile"] = False;
                else:

diff --git a/arch/x86.py b/arch/x86.py
index dded47811f16f910263a5906fa4a391bdb6868c2..66fe9c52a3ad1808627caeaabd5c208e2d8d53d2 100644 (file)
--- a/arch/x86.py
+++ b/arch/x86.py
@@ -7,8 +7,8 @@ class generic_x86(builder.generic):
        def __init__(self,myspec):
                builder.generic.__init__(self,myspec)
                if self.settings["buildarch"]=="amd64":
-                       if not os.path.exists("/bin/linux32"):
-                               raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix.)"
+                       if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
+                                       raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
                        self.settings["CHROOT"]="linux32 chroot"
                        self.settings["crosscompile"] = False;
                else: