From afac4b2b30d2a0b07568bfb0f7ce3355b0ebe013 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Wed, 17 Oct 2007 14:04:00 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ arch/ppc.py | 4 ++-- arch/sparc.py | 4 ++-- arch/x86.py | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 375671f3..071d9c25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 17 Oct 2007; Andrew Gaffney arch/ppc.py, + arch/sparc.py, arch/x86.py: + look for linux32 in /bin and /usr/bin + 12 Oct 2007; Andrew Gaffney 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 e9d843fe..7afd8b06 100644 --- 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 6804a407..adde6cdb 100644 --- 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 dded4781..66fe9c52 100644 --- 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: -- 2.26.2