diff options
| author |   Eric Edgar <rocket@gentoo.org> | 2005-07-07 18:49:32 +0000 |
|---|---|---|
| committer | Eric Edgar <rocket@gentoo.org> | 2005-07-07 18:49:32 +0000 |
| commit | 4fa46eef159f82d146add0a0564527f097dddf88 (patch) | |
| tree | 1b9bbf1c2b54561d3a7ac437d86bfea555997375 | |
| parent | Removed GRP_STAGE23_USE from stages 2 and 3 and clean up unnecessary portage ... (diff) | |
| download | gentoo-4fa46eef159f82d146add0a0564527f097dddf88.tar.gz gentoo-4fa46eef159f82d146add0a0564527f097dddf88.tar.bz2 gentoo-4fa46eef159f82d146add0a0564527f097dddf88.zip | |
Fix USE flags for grp build
| -rw-r--r-- | src/catalyst/ChangeLog | 5 | ||||
| -rw-r--r-- | src/catalyst/targets/grp/grp-chroot.sh | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 45cbbc53a0..94d241c4cc 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,9 @@ # 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.80 2005/07/07 16:59:50 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.81 2005/07/07 18:49:32 rocket Exp $ + + 07 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/grp/grp-chroot.sh: + Fix USE flags for grp build 07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: diff --git a/src/catalyst/targets/grp/grp-chroot.sh b/src/catalyst/targets/grp/grp-chroot.sh index 46f4a67026..054b28f078 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.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-chroot.sh,v 1.14.2.2 2005/07/07 18:49:32 rocket Exp $ # check portage version in seed stage portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ @@ -41,10 +41,13 @@ USE="build" emerge 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 - unset DISTDIR export PKGDIR="/tmp/grp/${clst_grp_target}" if [ -n "${clst_FETCH}" ] @@ -66,10 +69,8 @@ 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} bindist" + export USE="${USE} bindist" DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly ${clst_grp_packages} || exit 1 unset PKGDIR fi |