[gentoo-commits] proj/catalyst:pending commit in: targets/stage1/

[Brian Dolbec]

commit:     7fd5b929311713e393de00767c0a7a6cd5595f6d
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 03:10:53 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 03:14:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7fd5b929

We need to ensure bindist is set in USE when updating the seed (if we have OPTIONS="bindist").
Fix some typos / broken syntax.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 targets/stage1/stage1-chroot.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 4afc8fe..0c7e85b 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -26,12 +26,19 @@ clst_root_path=/ setup_pkgmgr "build"
 # Update stage3
 if [ -n "${clst_update_seed}" ]; then
 	if [ "${clst_update_seed}" == "yes" ]; then
+		# We might need BOOTSTRAP_USE to avoid blocks related to bindist use flag
+		[ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BOOTSTRAP_USE}\"" >> ${clst_make_conf}
+
 		echo "Updating seed stage..."
 		if [ -n "${clst_update_seed_command}" ]; then
 			clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
 		else
 			clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
 		fi
+
+		# Clean-up USE again
+		sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf}
+
 	elif [ "${clst_update_seed}" != "no" ]; then
 		echo "Invalid setting for update_seed: ${clst_update_seed}"
 		exit 1
@@ -47,22 +54,19 @@ make_destpath /tmp/stage1root
 
 ## START BUILD
 # First, we drop in a known-good baselayout
-[ -e ${clst_make_conf} ] && \
-	echo 'USE="${USE} -build"' >> ${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo 'USE="${USE} -build"' >> ${clst_make_conf}
 run_merge "--oneshot --nodeps sys-apps/baselayout"
-
-sed -i '/USE="${USE} -build"/d' ${clst_make_conf}
+sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
 
 # Now, we install our packages
-if [ -e ${clst_make_conf} ] && \
-	echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
+[ -e ${clst_make_conf} ] &&
+echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf}
+for useexpand in ${clst_HOSTUSEEXPAND}; do
+	x="clst_${useexpand}"
+	echo "${useexpand}=\"${!x}\"" \
 	>> ${clst_make_conf}
-	for useexpand in ${clst_HOSTUSEEXPAND}; do
-		x="clst_${useexpand}"
-		echo "${useexpand}=\"${!x}\"" \
-		>> ${clst_make_conf}
-	done
-fi
+done
+
 run_merge "--oneshot ${clst_buildpkgs}"
 sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
 	${clst_make_conf}