commit: 6d795daf6d86779b17206f8a558bfcac44822a6b Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> AuthorDate: Thu Sep 3 16:49:55 2015 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Thu Sep 3 16:49:55 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6d795daf
handle clst_BINDIST properly in stage1 revert 306d797509244bf3508def0aa6c1bbcdfb6e1257 and avoid double setting bindist during stage1 (cleanliness) targets/stage1/stage1-chroot.sh | 3 ++- targets/support/chroot-functions.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 91ab1fa..f77bd9f 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -6,7 +6,8 @@ source /tmp/chroot-functions.sh export clst_buildpkgs="$(/tmp/build.py)" # Setup our environment -BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" +[ -n "${clst_BINDIST}" ] && BINDIST="bindist" +BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}" FEATURES="${clst_myfeatures} nodoc noman noinfo -news" diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 2986ae7..91a2b5f 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -167,7 +167,8 @@ setup_gcc(){ 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}" + [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \ + && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}" # We need to merge our package manager with USE="build" set in case it is # portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could