summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2012-09-03 03:08:30 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2012-09-03 03:08:30 +0000
commit0393146a3894326a1dbf8642e42902762eb987d9 (patch)
treede62ee4ef7b5a502cfca23aa64711c1ecf18339f
parentWe need to quote UPDATE_SEED_STAGE or the test will always return sucess. (diff)
downloadcatalyst-0393146a3894326a1dbf8642e42902762eb987d9.tar.gz
catalyst-0393146a3894326a1dbf8642e42902762eb987d9.tar.bz2
catalyst-0393146a3894326a1dbf8642e42902762eb987d9.zip
Fix optional update of seed_stage.
-rw-r--r--targets/stage1/stage1-chroot.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 2c4dacac..c26bd726 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -18,18 +18,20 @@ then
exit 1
fi
+# Update stage3
+if [ -n "${clst_update_seed_cache}" ]; then
+ echo "Updating seed stage..."
+ clst_root_path=/ run_merge "--update --deep --newuse @world"
+else
+ echo "Skipping seed stage update..."
+fi
+
## START BUILD
# First, we drop in a known-good baselayout
[ -e /etc/portage/make.conf ] && \
echo 'USE="${USE} -build"' >> /etc/portage/make.conf
run_merge "--oneshot --nodeps sys-apps/baselayout"
-# Update stage3
-#UPDATE_SEED_STAGE="yes"
-if [ -n "${UPDATE_SEED_STAGE}" ]; then
- echo "Updating seed stage..."
- clst_root_path=/ run_merge "--update --deep --newuse @world"
-fi
sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
# Next, we install the package manager