From 66f45fa1c575924345f9aa1e407cae8f19335eac Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 13 Feb 2008 05:58:49 +0000 Subject: [PATCH] Move export of FEATURES to setup_myfeatures. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1297 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 ++++++++ modules/generic_stage_target.py | 2 +- targets/embedded/embedded-chroot.sh | 18 ++++++------------ targets/grp/grp-chroot.sh | 2 -- targets/livecd-stage1/livecd-stage1-chroot.sh | 6 ------ targets/netboot/netboot-chroot.sh | 6 +----- targets/stage3/stage3-chroot.sh | 5 +---- targets/stage4/stage4-chroot.sh | 8 -------- targets/support/chroot-functions.sh | 1 + targets/tinderbox/tinderbox-chroot.sh | 5 +---- 10 files changed, 19 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index b46e5b32..ac8dffc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Feb 2008; Chris Gianelloni + modules/generic_stage_target.py, targets/embedded/embedded-chroot.sh, + targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/netboot/netboot-chroot.sh, targets/stage3/stage3-chroot.sh, + targets/stage4/stage4-chroot.sh, targets/support/chroot-functions.sh, + targets/tinderbox/tinderbox-chroot.sh: + Move export of FEATURES to setup_myfeatures. + 12 Feb 2008; Chris Gianelloni catalyst, targets/stage1/stage1-chroot.sh: Added some debug code to stage1 and fixed a nice bug where we weren't diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index f3400963..f6c47146 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -350,7 +350,7 @@ class generic_stage_target(generic_target): hash_function=self.settings["hash_function"],verbose=False) print "Source path set to "+self.settings["source_path"] if os.path.isdir(self.settings["source_path"]): - print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf" + print "\tIf this is not desired, remove this directory or turn off seedcache in the options of catalyst.conf" print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n") def set_dest_path(self): diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh index e4c123dc..b7c7e88d 100755 --- a/targets/embedded/embedded-chroot.sh +++ b/targets/embedded/embedded-chroot.sh @@ -7,19 +7,13 @@ update_env_settings setup_myfeatures # Setup the environment -export FEATURES="${clst_myfeatures}" -#export clst_myemergeopts="${clst_myemergeopts} -O" -export USE="${clst_use}" -export DESTROOT=${clst_root_path} -export clst_root_path=/ +export DESTROOT="${clst_root_path}" +export clst_root_path="/" -run_emerge "${clst_myemergeopts}" -o "${clst_embedded_packages}" +echo "Installing dependencies into ${DESTROOT}..." +run_emerge -o "${clst_embedded_packages}" -#export clst_myemergeopts="${clst_myemergeopts} -B" -#run_emerge "${clst_embedded_packages}" - -export clst_root_path=${DESTROOT} -export clst_myemergeopts="${clst_myemergeopts} -1 -O" +export clst_root_path="${DESTROOT}" export INSTALL_MASK="${clst_install_mask}" -run_emerge "${clst_embedded_packages}" +run_emerge -1 -O "${clst_embedded_packages}" diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 228b8e4a..69f41453 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -8,8 +8,6 @@ update_env_settings setup_myfeatures -# Setup the environment -export FEATURES="${clst_myfeatures}" ## START BUILD setup_portage diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh index 023e6617..5274937a 100755 --- a/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -6,13 +6,7 @@ update_env_settings setup_myfeatures -# Setup the environment - -export FEATURES="${clst_myfeatures}" - ## START BUILD setup_portage -export USE="${clst_use} ${clst_HOSTUSE}" - run_emerge "${clst_packages}" diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh index bf51a0b3..370ec0c7 100755 --- a/targets/netboot/netboot-chroot.sh +++ b/targets/netboot/netboot-chroot.sh @@ -6,9 +6,5 @@ update_env_settings setup_myfeatures -# Setup our environment -export FEATURES="${clst_myfeatures}" - # START BUILD - -run_emerge ${clst_myemergeopts} ${clst_packages} +run_emerge "${clst_packages}" diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh index fd235171..a1e65ea0 100755 --- a/targets/stage3/stage3-chroot.sh +++ b/targets/stage3/stage3-chroot.sh @@ -6,10 +6,6 @@ update_env_settings setup_myfeatures -# Setup the build environment -export FEATURES="${clst_myfeatures}" -export USE="${USE} bindist ${clst_HOSTUSE}" - ## START BUILD # We need portage to be merged manually with USE="build" set to avoid frying # our make.conf, otherwise, the system target could take care of it. @@ -17,5 +13,6 @@ export USE="${USE} bindist ${clst_HOSTUSE}" setup_portage run_emerge "-e system" + rm -f /var/lib/portage/world touch /var/lib/portage/world diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh index ba9ab85e..7b6f08be 100755 --- a/targets/stage4/stage4-chroot.sh +++ b/targets/stage4/stage4-chroot.sh @@ -6,20 +6,12 @@ update_env_settings setup_myfeatures -# Setup the environment -export FEATURES="${clst_myfeatures}" - ## START BUILD setup_portage echo "Bringing system up to date using profile specific use flags" -export USE="${USE} ${clst_HOSTUSE}" run_emerge -u system echo "Emerging packages using stage4 use flags" -if [ -n "${clst_use}" ] -then - USE="${clst_HOSTUSE} ${clst_use}" -fi run_emerge "${clst_packages}" diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 6e721416..e7ab348e 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -114,6 +114,7 @@ setup_myfeatures(){ export PATH="/usr/lib/icecc/bin:${PATH}" export PREROOTPATH="/usr/lib/icecc/bin" fi + export FEATURES="${clst_myfeatures}" } setup_myemergeopts(){ diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index ef11e310..a4b55e3e 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.sh @@ -6,9 +6,6 @@ update_env_settings setup_myfeatures -# Setup the environment -export FEATURES="${clst_myfeatures}" - # START THE BUILD setup_portage @@ -33,7 +30,7 @@ do mkdir -p /tmp/packages/$x export PORT_LOGDIR="/tmp/packages/$x" - run_emerge --usepkg --buildpkg --newuse $x + run_emerge $x if [ "$?" != "0" ] then -- 2.26.2