From a73ab29985eb91c30a12b173cf3decc3842cc587 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 26 Jan 2005 21:59:40 +0000 Subject: [PATCH] Updated to use package.use correctly. Blame Robert Paskowitz from the gentoo-catalyst mailing list. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@528 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 10 +++++++++- targets/grp/grp-chroot.sh | 4 ++-- targets/livecd-stage1/livecd-stage1-chroot.sh | 4 ++-- targets/netboot/netboot-busybox.sh | 4 ++-- targets/netboot/netboot-kernel.sh | 4 ++-- targets/netboot/netboot-packages.sh | 4 ++-- targets/tinderbox/tinderbox-chroot.sh | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c9f6014..3ba2797d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.154 2005/01/26 15:34:28 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.155 2005/01/26 21:59:40 wolf31o2 Exp $ + + 26 Jan 2005; Chris Gianelloni + targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/netboot/netboot-busybox.sh, targets/netboot/netboot-kernel.sh, + targets/netboot/netboot-packages.sh, + targets/tinderbox/tinderbox-chroot.sh: + Updated to use package.use correctly. Blame Robert Paskowitz + from the gentoo-catalyst mailing list. 26 Jan 2005; Chris Gianelloni targets/stage1/stage1-preclean2-chroot.sh: diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 8dd5c2eb..10031551 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 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.12 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.13 2005/01/26 21:59:40 wolf31o2 Exp $ # check portage version in seed stage portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ @@ -40,7 +40,7 @@ export CONFIG_PROTECT="-*" USE="build" emerge portage #turn off auto-use: -export USE_ORDER="env:conf:defaults" +export USE_ORDER="env:pkg:conf:defaults" if [ "${clst_grp_type}" = "pkgset" ] then diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh index 0c0d7b93..af82c7cc 100755 --- a/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.12 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.13 2005/01/26 21:59:40 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -50,7 +50,7 @@ export CONFIG_PROTECT="-*" ## START BUILD USE="build" emerge portage #turn off auto-use: -export USE_ORDER="env:conf:defaults" +export USE_ORDER="env:pkg:conf:defaults" if [ "${clst_VERBOSE}" ] then diff --git a/targets/netboot/netboot-busybox.sh b/targets/netboot/netboot-busybox.sh index 17168f18..a379f8c5 100644 --- a/targets/netboot/netboot-busybox.sh +++ b/targets/netboot/netboot-busybox.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-busybox.sh,v 1.4 2005/01/11 15:22:41 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-busybox.sh,v 1.5 2005/01/26 21:59:40 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -11,7 +11,7 @@ source /etc/profile # setup our environment export FEATURES="${clst_myfeatures}" export CONFIG_PROTECT="-*" -export USE_ORDER="env:conf:defaults" +export USE_ORDER="env:pkg:conf:defaults" # Use the catalyst config export USE="netboot make-busybox-symlinks" diff --git a/targets/netboot/netboot-kernel.sh b/targets/netboot/netboot-kernel.sh index fe1d0c07..0a329d22 100644 --- a/targets/netboot/netboot-kernel.sh +++ b/targets/netboot/netboot-kernel.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-kernel.sh,v 1.5 2005/01/11 15:22:41 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-kernel.sh,v 1.6 2005/01/26 21:59:40 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -11,7 +11,7 @@ source /etc/profile # setup our environment export FEATURES="${clst_myfeatures}" export CONFIG_PROTECT="-*" -export USE_ORDER="env:conf:defaults" +export USE_ORDER="env:pkg:conf:defaults" mkdir -p ${GK_BINARIES} BUILD_KERNEL=1 diff --git a/targets/netboot/netboot-packages.sh b/targets/netboot/netboot-packages.sh index e5d392e2..7abe23bc 100644 --- a/targets/netboot/netboot-packages.sh +++ b/targets/netboot/netboot-packages.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.4 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.5 2005/01/26 21:59:40 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -20,7 +20,7 @@ source /etc/profile # setup our environment export FEATURES="${clst_myfeatures}" export CONFIG_PROTECT="-*" -export USE_ORDER="env:conf:defaults" +export USE_ORDER="env:pkg:conf:defaults" if [ "${clst_FETCH}" ] then diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 957702e9..38627cff 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.8 2004/10/15 02:46:58 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.9 2005/01/26 21:59:40 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -29,7 +29,7 @@ export CONFIG_PROTECT="-*" # START THE BUILD USE="build" emerge portage #turn off auto-use: -export USE_ORDER="env:conf:defaults" +export USE_ORDER="env:pkg:conf:defaults" #back up pristine system rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / /tmp/rsync-bak/ -- 2.26.2