[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage2/, targets/stage1/, targets/support/

[Matt Turner]

commit:     8569a25ab4d9fafa03684554e4fbfc80f8968d06
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 05:32:49 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:17:48 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8569a25a

targets: Make features variable local

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/stage1/chroot.sh            | 2 +-
 targets/stage2/chroot.sh            | 2 +-
 targets/support/chroot-functions.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index a42afd19..58ed2b1d 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
 [ -n "${clst_BINDIST}" ] && BINDIST="bindist"
 BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
 
-FEATURES="${features} nodoc noman noinfo -news"
+FEATURES="${FEATURES} nodoc noman noinfo -news"
 
 ## Sanity check profile
 if [ -z "${clst_buildpkgs}" ]

diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index e472fe16..0cbaeb1d 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -3,7 +3,7 @@
 source /tmp/chroot-functions.sh
 
 # Setup the environment
-export FEATURES="${features} nodoc noman noinfo -news"
+export FEATURES="${FEATURES} nodoc noman noinfo -news"
 export CONFIG_PROTECT="-* /etc/locale.gen"
 
 echo "$locales" > /etc/locale.gen

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2eb90117..a4074d91 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,17 +78,17 @@ get_libdir() {
 
 setup_features() {
        setup_emerge_opts
-       export features="-news binpkg-multi-instance clean-logs 
parallel-install"
+       local features="-news binpkg-multi-instance clean-logs parallel-install"
        export FEATURES="${features}"
        if [ -n "${clst_CCACHE}" ]
        then
-               export features="${features} ccache"
+               features="${features} ccache"
                clst_root_path=/ run_merge --oneshot --noreplace 
dev-util/ccache || exit 1
        fi
 
        if [ -n "${clst_DISTCC}" ]
        then
-               export features="${features} distcc"
+               features="${features} distcc"
                export DISTCC_HOSTS="${clst_distcc_hosts}"
                [ -e ${clst_make_conf} ] && \
                        echo 'USE="${USE} -avahi -gtk -gnome"' >> 
${clst_make_conf}