Fixed invocation of linux32 for x86 and ppc. This is for bug #138080.

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

diff --git a/ChangeLog b/ChangeLog
index ddc60d06d7153b5e91d5f0ff1b6a12c9e4f61292..c9bba925b2fb8b4f2424c0a6ee20ce016915e781 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.638 2006/06/22 14:54:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.639 2006/06/28 12:48:22 wolf31o2 Exp $
+
+  28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/ppc.py,
+  arch/x86.py:
+  Fixed invocation of linux32 for x86 and ppc.  This is for bug #138080.
 
   22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/arch/ppc.py b/arch/ppc.py
index 23f2f5464a98be0b5889975acf449c6548d0960a..43a52c03b5d352123837b717e6d7b258b028477b 100644 (file)
--- a/arch/ppc.py
+++ b/arch/ppc.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/arch/ppc.py,v 1.17 2006/01/11 23:27:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/ppc.py,v 1.18 2006/06/28 12:48:22 wolf31o2 Exp $
 
 import os,builder
 from catalyst_support import *
@@ -17,9 +17,9 @@ class generic_ppc(builder.generic):
                self.settings["mainarch"]="ppc"
                self.settings["CHOST"]="powerpc-unknown-linux-gnu"
                if self.settings["hostarch"]=="ppc64":
-                       if not os.path.exists("/usr/bin/linux32"):
-                               raise CatalystError,"required /usr/bin/linux32 executable not found."
-                       self.settings["CHROOT"]="/usr/bin/linux32 chroot"
+                       if not os.path.exists("/bin/linux32"):
+                               raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix."
+                       self.settings["CHROOT"]="linux32 chroot"
                else:
                        self.settings["CHROOT"]="chroot"
 

diff --git a/arch/x86.py b/arch/x86.py
index 60065d256587858fd9e7b8b9d438348c6a80a603..84439fb0893ed52c2bd19bbddf61508579e831d0 100644 (file)
--- a/arch/x86.py
+++ b/arch/x86.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/arch/x86.py,v 1.23 2006/01/23 23:09:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/arch/x86.py,v 1.24 2006/06/28 12:48:22 wolf31o2 Exp $
 
 import builder,os
 from catalyst_support import *
@@ -12,7 +12,7 @@ class generic_x86(builder.generic):
                self.settings["mainarch"]="x86"
                if self.settings["hostarch"]=="amd64":
                        if not os.path.exists("/bin/linux32"):
-                               raise CatalystError,"required /bin/linux32 executable not found (\"emerge linux32\" to fix.)"
+                               raise CatalystError,"required /bin/linux32 executable not found (\"emerge setarch\" to fix.)"
                        self.settings["CHROOT"]="linux32 chroot"
                else:
                        self.settings["CHROOT"]="chroot"