From: Chris Gianelloni Date: Thu, 7 Jul 2005 19:57:17 +0000 (+0000) Subject: Fix bindist invcation. X-Git-Tag: CATALYST_2_0_6_916~685 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=efedf7e4cab47a5b28b94d7b51b90f00eec7972e;p=catalyst.git Fix bindist invcation. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@768 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 54af1258..8e889bbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.301 2005/07/07 18:57:13 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.302 2005/07/07 19:57:17 wolf31o2 Exp $ + + 07 Jul 2005; Chris Gianelloni modules/grp_target.py, + targets/grp/grp-chroot.sh: + Fix bindist invcation. 07 Jul 2005; Chris Gianelloni targets/grp/grp-chroot.sh: diff --git a/modules/grp_target.py b/modules/grp_target.py index ab8980a0..368479d1 100644 --- a/modules/grp_target.py +++ b/modules/grp_target.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/modules/grp_target.py,v 1.11 2005/07/05 21:53:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.12 2005/07/07 19:57:17 wolf31o2 Exp $ """ The builder class for GRP (Gentoo Reference Platform) builds. @@ -54,7 +54,7 @@ class grp_target(generic_stage_target): def set_use(self): generic_stage_target.set_use(self) if self.settings.has_key("use"): - self.settings["use"].append("bindlist") + self.settings["use"].append("bindist") def set_mounts(self): self.mounts.append("/tmp/grp") diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 21840af9..ebb69acc 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.19 2005/07/07 18:57:13 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.20 2005/07/07 19:57:17 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -25,7 +25,7 @@ export USE_ORDER="env:pkg:conf:defaults" unset DISTDIR #don't grab MS core fonts, etc. -export USE="${USE} ${clst_grp_use} bindist" +export USE="${USE} ${clst_grp_use}" if [ "${clst_grp_type}" = "pkgset" ] then