From: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
Date: Tue, 23 Oct 2012 17:19:51 +0000 (-0400)
Subject: fix order of stage1 portage updates
X-Git-Tag: catalyst-2.0.12~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=694e7872695d384a170830835a1863ed1a2ebdfc;p=catalyst.git

fix order of stage1 portage updates

Reorder things based on proper understanding of stage1 builds.
This allows a slight reduction in redundancy.
---

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 6f7e5b01..a9536a63 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -18,15 +18,19 @@ then
 	exit 1
 fi
 
+## Setup seed pkgmgr to ensure latest
+clst_root_path=/ setup_pkgmgr
+
 # Update stage3
 if [ -n "${clst_update_seed_cache}" ]; then
 	echo "Updating seed stage..."
-	clst_root_path=/ setup_pkgmgr
 	clst_root_path=/ run_merge "--update --deep --newuse @world"
 else
 	echo "Skipping seed stage update..."
 fi
 
+make_destpath /tmp/stage1root
+
 ## START BUILD
 # First, we drop in a known-good baselayout
 [ -e /etc/portage/make.conf ] && \
@@ -35,10 +39,6 @@ run_merge "--oneshot --nodeps sys-apps/baselayout"
 
 sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
 
-# Next, we install the package manager
-clst_root_path=/ setup_pkgmgr
-make_destpath /tmp/stage1root
-
 # Now, we install our packages
 [ -e /etc/portage/make.conf ] && \
 	echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \