| 1 |
commit: 89a60c873d3de303c863e06429f0405c164186ac |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 22:55:11 2015 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 22:55:49 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=89a60c87 |
| 7 |
|
| 8 |
Move the code to deal with USE="bindist" to run_merge so we don't need to replicate it on all <target>-chroot.sh files. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
targets/livecd-stage1/livecd-stage1-chroot.sh | 6 ------ |
| 13 |
targets/stage1/stage1-chroot.sh | 7 ------- |
| 14 |
targets/stage3/stage3-chroot.sh | 6 ------ |
| 15 |
targets/support/chroot-functions.sh | 6 ++++++ |
| 16 |
4 files changed, 6 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh |
| 19 |
index d3b4674..9ddf8d4 100755 |
| 20 |
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh |
| 21 |
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh |
| 22 |
@@ -5,10 +5,4 @@ source /tmp/chroot-functions.sh |
| 23 |
## START BUILD |
| 24 |
setup_pkgmgr |
| 25 |
|
| 26 |
-# Set the bindist USE flag if clst_BINDIST is set |
| 27 |
-[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} |
| 28 |
- |
| 29 |
run_merge --update --deep --newuse "${clst_packages}" |
| 30 |
- |
| 31 |
-# Clean-up USE again |
| 32 |
-sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf} |
| 33 |
|
| 34 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 35 |
index 2853f04..028089e 100755 |
| 36 |
--- a/targets/stage1/stage1-chroot.sh |
| 37 |
+++ b/targets/stage1/stage1-chroot.sh |
| 38 |
@@ -27,19 +27,12 @@ clst_root_path=/ setup_pkgmgr "build" |
| 39 |
# Update stage3 |
| 40 |
if [ -n "${clst_update_seed}" ]; then |
| 41 |
if [ "${clst_update_seed}" == "yes" ]; then |
| 42 |
- # Set USE flags build and bindist if clst_BINDIST is set |
| 43 |
- [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}\"" >> ${clst_make_conf} |
| 44 |
- |
| 45 |
echo "Updating seed stage..." |
| 46 |
if [ -n "${clst_update_seed_command}" ]; then |
| 47 |
clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
| 48 |
else |
| 49 |
clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" |
| 50 |
fi |
| 51 |
- |
| 52 |
- # Clean-up USE again |
| 53 |
- sed -i "/USE=\"${USE} build ${BINDIST}\"/d" ${clst_make_conf} |
| 54 |
- |
| 55 |
elif [ "${clst_update_seed}" != "no" ]; then |
| 56 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
| 57 |
exit 1 |
| 58 |
|
| 59 |
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh |
| 60 |
index d46234c..6cf9106 100755 |
| 61 |
--- a/targets/stage3/stage3-chroot.sh |
| 62 |
+++ b/targets/stage3/stage3-chroot.sh |
| 63 |
@@ -5,10 +5,4 @@ source /tmp/chroot-functions.sh |
| 64 |
## START BUILD |
| 65 |
setup_pkgmgr |
| 66 |
|
| 67 |
-# Set bindist USE flag if clst_BINDIST is set |
| 68 |
-[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} |
| 69 |
- |
| 70 |
run_merge "-e @system" |
| 71 |
- |
| 72 |
-# Clean-up USE again |
| 73 |
-sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf} |
| 74 |
|
| 75 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 76 |
index 7184984..95904b3 100755 |
| 77 |
--- a/targets/support/chroot-functions.sh |
| 78 |
+++ b/targets/support/chroot-functions.sh |
| 79 |
@@ -269,6 +269,9 @@ run_merge() { |
| 80 |
export EPAUSE_IGNORE=0 |
| 81 |
export CONFIG_PROTECT="-*" |
| 82 |
|
| 83 |
+ # Set bindist USE flag if clst_BINDIST is set |
| 84 |
+ [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} |
| 85 |
+ |
| 86 |
if [ -n "${clst_VERBOSE}" ] |
| 87 |
then |
| 88 |
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 |
| 89 |
@@ -285,6 +288,9 @@ run_merge() { |
| 90 |
echo "emerge ${clst_myemergeopts} $@" || exit 1 |
| 91 |
|
| 92 |
emerge ${clst_myemergeopts} $@ || exit 1 |
| 93 |
+ |
| 94 |
+ # Clean-up USE again |
| 95 |
+ sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf} |
| 96 |
} |
| 97 |
|
| 98 |
show_debug() { |
Archives