Clean up the USE usage in GRP/stage4.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1189 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 43487b5454104aa47fb58a5b0b548b2a96ca56a4..7d9f303021f9d5ec6bca23dad85c8e7a0c309696 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # 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 <wolf31o2@gentoo.org>
+  targets/grp/grp-chroot.sh, targets/stage4/stage4-chroot.sh:
+  Clean up the USE usage in GRP/stage4.
+
   22 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py, modules/stage1_target.py,
   modules/stage2_target.py:

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 3b5e34d6782ba53dafc0a027e5e1ada683975be8..c2f6aab24edf4368057495a09e05d6bb203627b3 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -17,7 +17,7 @@ setup_portage
 unset DISTDIR
 
 # Don't grab MS core fonts, etc.
-export USE="${USE} ${clst_use}"
+export USE="${USE} ${clst_HOSTUSE} ${clst_use}"
 
 if [ "${clst_grp_type}" = "pkgset" ]
 then

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 4fc393c7af04b1b201fbf475c4eec60f58903f7f..ee04631bf058e965af9775b98a98f26611b6bf50 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -19,10 +19,7 @@ run_emerge -u system
 
 echo "Emerging packages using stage4 use flags"
 if [ -n "${clst_use}" ]
-then 
-       export USE="${USE} ${clst_HOSTUSE}"
-else   
-       USE="${clst_use}"
+       USE="${clst_HOSTUSE} ${clst_use}"
 fi
 
 run_emerge "${clst_packages}"