summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-07-07 19:57:29 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-07-07 19:57:29 +0000
commitfaa11031ff3797a796bf861d4d0f4539383a72bf (patch)
treea1d2a268f6191d0ff8ead9efbe31ad8e78b4db94
parentMade sure bindist was used for all emerges in GRP. (diff)
downloadgentoo-faa11031ff3797a796bf861d4d0f4539383a72bf.tar.gz
gentoo-faa11031ff3797a796bf861d4d0f4539383a72bf.tar.bz2
gentoo-faa11031ff3797a796bf861d4d0f4539383a72bf.zip
Fix bindist invocation.
-rw-r--r--src/catalyst/ChangeLog6
-rw-r--r--src/catalyst/modules/grp_target.py4
-rw-r--r--src/catalyst/targets/grp/grp-chroot.sh4
3 files changed, 9 insertions, 5 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog
index 49479d35e6..1016c0bc24 100644
--- a/src/catalyst/ChangeLog
+++ b/src/catalyst/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gentoo/src/catalyst
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.82 2005/07/07 18:58:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.83 2005/07/07 19:57:28 wolf31o2 Exp $
+
+ 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> modules/grp_target.py,
+ targets/grp/grp-chroot.sh:
+ Fix bindist invoocation.
07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
targets/grp/grp-chroot.sh:
diff --git a/src/catalyst/modules/grp_target.py b/src/catalyst/modules/grp_target.py
index 90ab8fac74..ff513cda3b 100644
--- a/src/catalyst/modules/grp_target.py
+++ b/src/catalyst/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/Attic/grp_target.py,v 1.6.2.2 2005/07/05 21:47:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/grp_target.py,v 1.6.2.3 2005/07/07 19:57:28 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):
self.settings["use"]=self.settings["grp/use"]
- self.settings["use"].append("bindlist")
+ self.settings["use"].append("bindist")
def set_mounts(self):
self.mounts.append("/tmp/grp")
diff --git a/src/catalyst/targets/grp/grp-chroot.sh b/src/catalyst/targets/grp/grp-chroot.sh
index 504114b888..f3c0877910 100644
--- a/src/catalyst/targets/grp/grp-chroot.sh
+++ b/src/catalyst/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/Attic/grp-chroot.sh,v 1.14.2.3 2005/07/07 18:58:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-chroot.sh,v 1.14.2.4 2005/07/07 19:57:29 wolf31o2 Exp $
# check portage version in seed stage
portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
@@ -44,7 +44,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