From: Eric Edgar <rocket@gentoo.org>
Date: Thu, 7 Jul 2005 18:18:15 +0000 (+0000)
Subject: let grp use the users environment variables and removed extra grp_stage23_use from... 
X-Git-Tag: CATALYST_2_0_6_916~688
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96c5973db6f373ffb120785157708a01a00b79e3;p=catalyst.git

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


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 a170d0b4..9d29af6b 100644
--- 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 7128debc..1a27c556 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.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 436126d9..1d6b265a 100755
--- 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