Added some debug code to stage1 and fixed a nice bug where we weren't building with...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1296 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 82da85d9574b72c73c67746e0a2e9024bfa11e2f..b46e5b32b8e6da1c2a419ba21de5a39d40d4a299 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  12 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> 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 <wolf31o2@gentoo.org>
   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 3b9fc44b219f8376a42533237dde667de774f7e1..a9bd65387155c6f699197e32e0bab33d2217e6e9 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__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 4b078818ff6f9802bf6f73e93912f7e08dad26ba..07e136644cd43720963f66158c85801f9588c886 100755 (executable)
--- 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