From 3b71c969f16af7c9ebec9ebe47dfbdba3d241e49 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Thu, 7 Jul 2005 17:21:08 +0000 Subject: [PATCH] Remove unnecessary GRP_STAGE23_USE from stage2 and stage3 builds git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@762 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/stage2/stage2-chroot.sh | 3 +-- targets/stage3/stage3-chroot.sh | 5 ++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 675d8ff2..a170d0b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.297 2005/07/07 14:27:31 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.298 2005/07/07 17:21:08 rocket Exp $ + + 07 Jul 2005; Eric Edgar + targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh: + Remove unnecessary GRP_STAGE23_USE from stage2 and stage3 builds 07 Jul 2005; Eric Edgar targets/support/rc-update.sh: fix bug 98165. Change the separator on rcadd/rcdel from : to | This will diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index 664cea84..c0ea051a 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-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/stage2/stage2-chroot.sh,v 1.13 2005/07/05 21:53:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.14 2005/07/07 17:21:08 rocket Exp $ . /tmp/chroot-functions.sh @@ -13,7 +13,6 @@ setup_myemergeopts ## setup the environment export FEATURES="${clst_myfeatures}" -GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)" if [ "${clst_VERBOSE}" ] then diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh index 6f6823cc..81b452e5 100755 --- a/targets/stage3/stage3-chroot.sh +++ b/targets/stage3/stage3-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/stage3/stage3-chroot.sh,v 1.20 2005/07/05 21:53:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.21 2005/07/07 17:21:08 rocket Exp $ . /tmp/chroot-functions.sh check_portage_version @@ -15,8 +15,7 @@ setup_myemergeopts # setup the build environment export FEATURES="${clst_myfeatures}" export CONFIG_PROTECT="-*" -export GRP_STAGE23_USE="$(portageq envvar GRP_STAGE23_USE)" -export USE="-* ${clst_HOSTUSE} ${GRP_STAGE23_USE}" +export USE="-* ${clst_HOSTUSE}" ## START BUILD -- 2.26.2