From b9983ae5eaa434cfeed095a3200279f977b93580 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 7 Jul 2005 18:57:13 +0000 Subject: [PATCH] Made sure bindist was used for all emerges in GRP. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@766 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/grp/grp-chroot.sh | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44b7d40f..54af1258 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.300 2005/07/07 18:48:08 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.301 2005/07/07 18:57:13 wolf31o2 Exp $ + + 07 Jul 2005; Chris Gianelloni + targets/grp/grp-chroot.sh: + Made sure bindist was used for all emerges in GRP. 07 Jul 2005; Eric Edgar targets/grp/grp-chroot.sh: Fix USE flags for grp build diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 2e131db0..21840af9 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.18 2005/07/07 18:48:08 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.19 2005/07/07 18:57:13 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}" +export USE="${USE} ${clst_grp_use} bindist" if [ "${clst_grp_type}" = "pkgset" ] then @@ -48,10 +48,8 @@ then read -s -n 1 fi fi - emerge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} ${clst_grp_packages} || exit 1 else - export USE="${USE} bindist" DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly ${clst_grp_packages} || exit 1 unset PKGDIR fi -- 2.26.2