[gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/livecd-stage1/

[gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/livecd-stage1/

[Jorge Manuel B. S. Vicetto]

commit:     8c395e8608549ae910fd09abdcd119e876e8dfdf
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 16:40:46 2015 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 16:40:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8c395e86

We need to preserve bindist for later stages (if set). This will also need to be done to stage4 and netboot targets.
This is temporary until we move to catalyst_build_use.

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

 targets/livecd-stage1/livecd-stage1-chroot.sh | 6 ++++++
 targets/stage3/stage3-chroot.sh               | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 9ddf8d4..d3b4674 100755
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -5,4 +5,10 @@ source /tmp/chroot-functions.sh
 ## START BUILD
 setup_pkgmgr
 
+# Set the bindist USE flag if clst_BINDIST is set
+[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf}
+
 run_merge --update --deep --newuse "${clst_packages}"
+
+# Clean-up USE again
+sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf}

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index 6cf9106..d46234c 100755
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -5,4 +5,10 @@ source /tmp/chroot-functions.sh
 ## START BUILD
 setup_pkgmgr
 
+# Set bindist USE flag if clst_BINDIST is set
+[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf}
+
 run_merge "-e @system"
+
+# Clean-up USE again
+sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf}