1 |
commit: 8c395e8608549ae910fd09abdcd119e876e8dfdf |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 16:40:46 2015 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 16:40:46 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8c395e86 |
7 |
|
8 |
We need to preserve bindist for later stages (if set). This will also need to be done to stage4 and netboot targets. |
9 |
This is temporary until we move to catalyst_build_use. |
10 |
|
11 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
12 |
|
13 |
targets/livecd-stage1/livecd-stage1-chroot.sh | 6 ++++++ |
14 |
targets/stage3/stage3-chroot.sh | 6 ++++++ |
15 |
2 files changed, 12 insertions(+) |
16 |
|
17 |
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh |
18 |
index 9ddf8d4..d3b4674 100755 |
19 |
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh |
20 |
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh |
21 |
@@ -5,4 +5,10 @@ source /tmp/chroot-functions.sh |
22 |
## START BUILD |
23 |
setup_pkgmgr |
24 |
|
25 |
+# Set the bindist USE flag if clst_BINDIST is set |
26 |
+[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} |
27 |
+ |
28 |
run_merge --update --deep --newuse "${clst_packages}" |
29 |
+ |
30 |
+# Clean-up USE again |
31 |
+sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf} |
32 |
|
33 |
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh |
34 |
index 6cf9106..d46234c 100755 |
35 |
--- a/targets/stage3/stage3-chroot.sh |
36 |
+++ b/targets/stage3/stage3-chroot.sh |
37 |
@@ -5,4 +5,10 @@ source /tmp/chroot-functions.sh |
38 |
## START BUILD |
39 |
setup_pkgmgr |
40 |
|
41 |
+# Set bindist USE flag if clst_BINDIST is set |
42 |
+[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} |
43 |
+ |
44 |
run_merge "-e @system" |
45 |
+ |
46 |
+# Clean-up USE again |
47 |
+sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf} |