Moved creating of stage1 package list to the beginning of stage1-chroot.sh so we...

[catalyst.git] / targets / stage1 / stage1-chroot.sh

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index e4aa826c3fc4a9c943e5a5707de49b5ba439fc32..e4f344742d1b4323c1e30ef7b4ef9be17971c6ef 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,16 +1,13 @@
 #!/bin/bash
 
-. /tmp/chroot-functions.sh
-
-update_env_settings
+# We do this first, so we know our package list for --debug
+export clst_buildpkgs="$(/tmp/build.py)"
 
-setup_myfeatures
-setup_myemergeopts
+source /tmp/chroot-functions.sh
 
 # Setup our environment
-export clst_buildpkgs="$(/tmp/build.py)"
 export STAGE1_USE="$(portageq envvar STAGE1_USE)"
-export USE="-* build ${STAGE1_USE}"
+export USE="-* bindist build ${STAGE1_USE}"
 export FEATURES="${clst_myfeatures} nodoc noman noinfo"
 
 ## Sanity check profile
@@ -25,8 +22,6 @@ fi
 ## START BUILD
 clst_root_path=/ setup_portage
 
-run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
-rm -f /var/lib/portage/world
-touch /var/lib/portage/world
+USE="-build" run_emerge "--oneshot --nodeps virtual/baselayout"
 
-rm -f /var/log/emerge.log
+USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_emerge "--noreplace --oneshot --newuse ${clst_buildpkgs}"