diff options
| author |   Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2015-08-30 03:51:02 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2015-08-30 03:51:02 +0000 |
| commit | d0e1598f3af1adb5d3a8959740cef4dce66f75da (patch) | |
| tree | 7f3c09ecd2301a203105ec75eff8671717208433 | |
| parent | We need to ensure bindist is set in USE when updating the seed (if we have OP... (diff) | |
| download | catalyst-d0e1598f.tar.gz catalyst-d0e1598f.tar.bz2 catalyst-d0e1598f.zip | |
Switch back to the if block for setting make.conf.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
| -rwxr-xr-x | targets/stage1/stage1-chroot.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 0c7e85be..01ef8d12 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" \ |