Signed-off-by: Matt Turner <[email protected]>
---
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}
--
2.26.2
