let grp use the users environment variables and removed extra grp_stage23_use from...

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

diff --git a/ChangeLog b/ChangeLog
index a170d0b4f15f4d15c398d89402935b7431a76d80..9d29af6bc328310bc7c2343314f6763953d95dc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.298 2005/07/07 17:21:08 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.299 2005/07/07 18:18:15 rocket Exp $
+
+  07 Jul 2005; Eric Edgar <rocket@gentoo.org> targets/grp/grp-chroot.sh,
+  targets/stage4/stage4-chroot.sh:
+  let grp use the users environment variables and removed extra
+  grp_stage23_use from stage4
 
   07 Jul 2005; Eric Edgar <rocket@gentoo.org>
   targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh:

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 7128debc453fbd7747cfde6e7373a51d1012a664..1a27c5560ecc9a0e4fbd2b28e3df2c8b6b032ad1 100755 (executable)
--- 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.16 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.17 2005/07/07 18:18:15 rocket Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -17,7 +17,6 @@ setup_myfeatures
 # setup the environment
 export FEATURES="${clst_myfeatures}"
 export CONFIG_PROTECT="-*"
-
 ## START BUILD
 setup_portage
 
@@ -50,7 +49,7 @@ then
 else
        unset DISTDIR
        #don't grab MS core fonts, etc.
-       export USE="${USE} bindist"
+       export USE="${USE} ${clst_grp_use} bindist"
        
        DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly ${clst_grp_packages} || exit 1
        unset PKGDIR

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 436126d98fed6dbfb9c25d6cca3184ada5c1d1aa..1d6b265a62b20ab02ef00c7068492c46315037a4 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -20,15 +20,14 @@ setup_portage
 export USE_ORDER="env:pkg:conf:defaults"       
 
 echo "Bringing system up to date using profile specific use flags"
-GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)"
-export USE="-* ${clst_HOSTUSE} ${GRP_STAGE23_USE}"
+export USE="-* ${clst_HOSTUSE}"
 run_emerge -u system
 
 
 echo "Emerging packages using stage4 use flags"
 if [ -n "${clst_stage4_use}" ]
 then 
-       export USE="-* ${clst_HOSTUSE} ${GRP_STAGE23_USE}"
+       export USE="-* ${clst_HOSTUSE}"
 else   
        USE="${clst_stage4_use}"
 fi