From 3db3a5defad5b4f79d83a4904f541931a8a5a022 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Thu, 7 Jul 2005 18:48:08 +0000 Subject: [PATCH] Fix USE flags for grp build git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@764 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++- targets/grp/grp-chroot.sh | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d29af6b..44b7d40f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.299 2005/07/07 18:18:15 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.300 2005/07/07 18:48:08 rocket Exp $ + + 07 Jul 2005; Eric Edgar targets/grp/grp-chroot.sh: + Fix USE flags for grp build 07 Jul 2005; Eric Edgar targets/grp/grp-chroot.sh, targets/stage4/stage4-chroot.sh: diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 1a27c556..2e131db0 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.17 2005/07/07 18:18:15 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.18 2005/07/07 18:48:08 rocket Exp $ . /tmp/chroot-functions.sh @@ -22,6 +22,10 @@ setup_portage #turn off auto-use: export USE_ORDER="env:pkg:conf:defaults" + +unset DISTDIR +#don't grab MS core fonts, etc. +export USE="${USE} ${clst_grp_use}" if [ "${clst_grp_type}" = "pkgset" ] then @@ -47,10 +51,7 @@ then emerge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} ${clst_grp_packages} || exit 1 else - unset DISTDIR - #don't grab MS core fonts, etc. - export USE="${USE} ${clst_grp_use} bindist" - + export USE="${USE} bindist" DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly ${clst_grp_packages} || exit 1 unset PKGDIR fi -- 2.26.2