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

[Brian Dolbec]

commit:     ceafc1abfdffb34e1dc0f5e1d9ec08c02f189786
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo 
<DOT> org>
AuthorDate: Sun Aug 30 04:31:34 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 04:31:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ceafc1ab

Don't use BOOTSTRAP_USE to update the seed but just build and bindist (if set).

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

 targets/stage1/stage1-chroot.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 01ef8d1..ebd6551 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -7,7 +7,8 @@ export clst_buildpkgs="$(/tmp/build.py)"
 
 # Setup our environment
 BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-[ -n "${clst_BINDIST}" ] && BOOTSTRAP_USE="${BOOTSTRAP_USE} bindist"
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
 
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 
@@ -26,8 +27,8 @@ 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}
+               # Set USE flags build and bindist if clst_BINDIST is set
+               [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build 
${BINDIST}" >> ${clst_make_conf}
 
                echo "Updating seed stage..."
                if [ -n "${clst_update_seed_command}" ]; then
@@ -37,7 +38,7 @@ if [ -n "${clst_update_seed}" ]; then
                fi
 
                # Clean-up USE again
-               sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf}
+               sed -i "/USE=\"${USE} build ${BINDIST}\"/d" ${clst_make_conf}
 
        elif [ "${clst_update_seed}" != "no" ]; then
                echo "Invalid setting for update_seed: ${clst_update_seed}"