From c16b22257f221a3f41f76bb468deb446c0403776 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 12 Feb 2008 04:15:49 +0000 Subject: [PATCH] Added some debug code to stage1 and fixed a nice bug where we weren't building with the correct USE. Unfortunately, this invalidates any caches for stage1, since we were building with the entire USE from the profile. This is 2.0.6_pre4 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1296 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 +++++++ catalyst | 2 +- targets/stage1/stage1-chroot.sh | 17 ++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82da85d9..b46e5b32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 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 + building with the correct USE. Unfortunately, this invalidates any caches + for stage1, since we were building with the entire USE from the profile. + This is 2.0.6_pre4 for testing. + 11 Feb 2008; Chris Gianelloni targets/stage1/stage1-chroot.sh: We don't need to do the device building twice, so removing USE=build from diff --git a/catalyst b/catalyst index 3b9fc44b..a9bd6538 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.6_pre3" +__version__="2.0.6_pre4" conf_values={} diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 4b078818..07e13664 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -21,12 +21,27 @@ then exit 1 fi +if [ "${debug}" = "1" ] +then + echo "DEBUG:" + echo "Profile inheritance:" + python -c 'import portage; print portage.settings.profiles' + echo "STAGE1_USE: $(portageq envvar STAGE1_USE)" + echo "USE (profile): $(portageq envvar USE)" + echo "USE (stage1): ${USE}" + echo "FEATURES (profile): $(portageq envvar FEATURES)" + echo "FEATURES (stage1): ${FEATURES}" + + exit 1 +fi + ## START BUILD clst_root_path=/ setup_portage USE="-build" run_emerge "--oneshot --nodeps virtual/baselayout" -run_emerge "--noreplace --oneshot ${clst_buildpkgs}" +USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_emerge "--noreplace --oneshot ${clst_buildpkgs}" + rm -f /var/lib/portage/world touch /var/lib/portage/world -- 2.26.2