From 1b826c72c178b22e40a14841ca8585e2f9eadfdf Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 22 Nov 2006 14:59:36 +0000 Subject: [PATCH] Added patch from Andrew Gaffney to remove all instances of USE_ORDER since auto hasn't been valid for some time. This is wrt bug #155864. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1187 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 ++++++++ targets/grp/grp-chroot.sh | 3 --- targets/livecd-stage1/livecd-stage1-chroot.sh | 2 -- targets/netboot/netboot-chroot.sh | 1 - targets/netboot2/netboot2-pkg.sh | 1 - targets/stage4/stage4-chroot.sh | 2 -- targets/tinderbox/tinderbox-chroot.sh | 2 -- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49bb7c6e..e6cab7b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ + 22 Nov 2006; Chris Gianelloni + targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/netboot/netboot-chroot.sh, targets/netboot2/netboot2-pkg.sh, + targets/stage4/stage4-chroot.sh, targets/tinderbox/tinderbox-chroot.sh: + Added patch from Andrew Gaffney to remove all + instances of USE_ORDER since auto hasn't been valid for some time. This is + wrt bug #155864. + 22 Nov 2006; Chris Gianelloni modules/generic_stage_target.py, modules/stage1_target.py: Added patch from Daniel Ostrow for added FreeBSD diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 6a283856..3b5e34d6 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -14,9 +14,6 @@ export FEATURES="${clst_myfeatures}" ## START BUILD setup_portage -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" - unset DISTDIR # Don't grab MS core fonts, etc. diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh index 1531c297..2c322748 100755 --- a/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -15,8 +15,6 @@ export FEATURES="${clst_myfeatures}" ## START BUILD setup_portage -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" export USE="${clst_use}" run_emerge "${clst_packages}" diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh index b4fcf362..afb21f00 100755 --- a/targets/netboot/netboot-chroot.sh +++ b/targets/netboot/netboot-chroot.sh @@ -10,7 +10,6 @@ setup_myemergeopts # Setup our environment export FEATURES="${clst_myfeatures}" -export USE_ORDER="env:pkg:conf:defaults" # START BUILD diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh index 5c25e012..d0cc40be 100644 --- a/targets/netboot2/netboot2-pkg.sh +++ b/targets/netboot2/netboot2-pkg.sh @@ -10,7 +10,6 @@ setup_myemergeopts # Setup our environment export FEATURES="${clst_myfeatures}" -export USE_ORDER="env:pkg:conf:defaults" # START BUILD diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh index 024f4c3b..4fc393c7 100755 --- a/targets/stage4/stage4-chroot.sh +++ b/targets/stage4/stage4-chroot.sh @@ -12,8 +12,6 @@ export FEATURES="${clst_myfeatures}" ## START BUILD setup_portage -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" echo "Bringing system up to date using profile specific use flags" export USE="${USE} ${clst_HOSTUSE}" diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 7aba02a6..7972767a 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -13,8 +13,6 @@ export FEATURES="${clst_myfeatures}" # START THE BUILD setup_portage -# Turn off auto-use: -export USE_ORDER="env:pkg:conf:defaults" # Backup pristine system rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \ -- 2.26.2