| 1 |
commit: d0e1598f3af1adb5d3a8959740cef4dce66f75da |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 03:51:02 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 03:51:02 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0e1598f |
| 7 |
|
| 8 |
Switch back to the if block for setting make.conf. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
targets/stage1/stage1-chroot.sh | 15 ++++++++------- |
| 13 |
1 file changed, 8 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 16 |
index 0c7e85b..01ef8d1 100755 |
| 17 |
--- a/targets/stage1/stage1-chroot.sh |
| 18 |
+++ b/targets/stage1/stage1-chroot.sh |
| 19 |
@@ -59,13 +59,14 @@ run_merge "--oneshot --nodeps sys-apps/baselayout" |
| 20 |
sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} |
| 21 |
|
| 22 |
# Now, we install our packages |
| 23 |
-[ -e ${clst_make_conf} ] && |
| 24 |
-echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} |
| 25 |
-for useexpand in ${clst_HOSTUSEEXPAND}; do |
| 26 |
- x="clst_${useexpand}" |
| 27 |
- echo "${useexpand}=\"${!x}\"" \ |
| 28 |
- >> ${clst_make_conf} |
| 29 |
-done |
| 30 |
+if [ -e ${clst_make_conf} ]; then |
| 31 |
+ echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} |
| 32 |
+ for useexpand in ${clst_HOSTUSEEXPAND}; do |
| 33 |
+ x="clst_${useexpand}" |
| 34 |
+ echo "${useexpand}=\"${!x}\"" \ |
| 35 |
+ >> ${clst_make_conf} |
| 36 |
+ done |
| 37 |
+fi |
| 38 |
|
| 39 |
run_merge "--oneshot ${clst_buildpkgs}" |
| 40 |
sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \ |
Archives