| 1 |
commit: ceafc1abfdffb34e1dc0f5e1d9ec08c02f189786 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 04:31:34 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 04:31:34 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ceafc1ab |
| 7 |
|
| 8 |
Don't use BOOTSTRAP_USE to update the seed but just build and bindist (if set). |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
targets/stage1/stage1-chroot.sh | 9 +++++---- |
| 13 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 16 |
index 01ef8d1..ebd6551 100755 |
| 17 |
--- a/targets/stage1/stage1-chroot.sh |
| 18 |
+++ b/targets/stage1/stage1-chroot.sh |
| 19 |
@@ -7,7 +7,8 @@ export clst_buildpkgs="$(/tmp/build.py)" |
| 20 |
|
| 21 |
# Setup our environment |
| 22 |
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" |
| 23 |
-[ -n "${clst_BINDIST}" ] && BOOTSTRAP_USE="${BOOTSTRAP_USE} bindist" |
| 24 |
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist" |
| 25 |
+BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}" |
| 26 |
|
| 27 |
FEATURES="${clst_myfeatures} nodoc noman noinfo -news" |
| 28 |
|
| 29 |
@@ -26,8 +27,8 @@ clst_root_path=/ setup_pkgmgr "build" |
| 30 |
# Update stage3 |
| 31 |
if [ -n "${clst_update_seed}" ]; then |
| 32 |
if [ "${clst_update_seed}" == "yes" ]; then |
| 33 |
- # We might need BOOTSTRAP_USE to avoid blocks related to bindist use flag |
| 34 |
- [ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BOOTSTRAP_USE}\"" >> ${clst_make_conf} |
| 35 |
+ # Set USE flags build and bindist if clst_BINDIST is set |
| 36 |
+ [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}" >> ${clst_make_conf} |
| 37 |
|
| 38 |
echo "Updating seed stage..." |
| 39 |
if [ -n "${clst_update_seed_command}" ]; then |
| 40 |
@@ -37,7 +38,7 @@ if [ -n "${clst_update_seed}" ]; then |
| 41 |
fi |
| 42 |
|
| 43 |
# Clean-up USE again |
| 44 |
- sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf} |
| 45 |
+ sed -i "/USE=\"${USE} build ${BINDIST}\"/d" ${clst_make_conf} |
| 46 |
|
| 47 |
elif [ "${clst_update_seed}" != "no" ]; then |
| 48 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
Archives