From 93f0a7aa575096d29833e69b7d693c00e69fbe7f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 28 Jun 2006 12:48:22 +0000 Subject: [PATCH] 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 --- ChangeLog | 6 +++++- arch/ppc.py | 8 ++++---- arch/x86.py | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddc60d06..c9bba925 100644 --- 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 arch/ppc.py, + arch/x86.py: + Fixed invocation of linux32 for x86 and ppc. This is for bug #138080. 22 Jun 2006; Chris Gianelloni modules/generic_stage_target.py: diff --git a/arch/ppc.py b/arch/ppc.py index 23f2f546..43a52c03 100644 --- 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 60065d25..84439fb0 100644 --- 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" -- 2.26.2