commit: d0e1598f3af1adb5d3a8959740cef4dce66f75da Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> AuthorDate: Sun Aug 30 03:51:02 2015 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Sun Aug 30 03:51:02 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0e1598f
Switch back to the if block for setting make.conf. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> targets/stage1/stage1-chroot.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 0c7e85b..01ef8d1 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -59,13 +59,14 @@ run_merge "--oneshot --nodeps sys-apps/baselayout" sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} # Now, we install our packages -[ -e ${clst_make_conf} ] && -echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} -for useexpand in ${clst_HOSTUSEEXPAND}; do - x="clst_${useexpand}" - echo "${useexpand}=\"${!x}\"" \ - >> ${clst_make_conf} -done +if [ -e ${clst_make_conf} ]; then + echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + for useexpand in ${clst_HOSTUSEEXPAND}; do + x="clst_${useexpand}" + echo "${useexpand}=\"${!x}\"" \ + >> ${clst_make_conf} + done +fi run_merge "--oneshot ${clst_buildpkgs}" sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \