| 1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 2 |
--- |
| 3 |
targets/stage1/chroot.sh | 2 +- |
| 4 |
targets/stage2/chroot.sh | 2 +- |
| 5 |
targets/support/chroot-functions.sh | 6 +++--- |
| 6 |
3 files changed, 5 insertions(+), 5 deletions(-) |
| 7 |
|
| 8 |
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh |
| 9 |
index a42afd19..58ed2b1d 100755 |
| 10 |
--- a/targets/stage1/chroot.sh |
| 11 |
+++ b/targets/stage1/chroot.sh |
| 12 |
@@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)" |
| 13 |
[ -n "${clst_BINDIST}" ] && BINDIST="bindist" |
| 14 |
BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" |
| 15 |
|
| 16 |
-FEATURES="${features} nodoc noman noinfo -news" |
| 17 |
+FEATURES="${FEATURES} nodoc noman noinfo -news" |
| 18 |
|
| 19 |
## Sanity check profile |
| 20 |
if [ -z "${clst_buildpkgs}" ] |
| 21 |
diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh |
| 22 |
index e472fe16..0cbaeb1d 100755 |
| 23 |
--- a/targets/stage2/chroot.sh |
| 24 |
+++ b/targets/stage2/chroot.sh |
| 25 |
@@ -3,7 +3,7 @@ |
| 26 |
source /tmp/chroot-functions.sh |
| 27 |
|
| 28 |
# Setup the environment |
| 29 |
-export FEATURES="${features} nodoc noman noinfo -news" |
| 30 |
+export FEATURES="${FEATURES} nodoc noman noinfo -news" |
| 31 |
export CONFIG_PROTECT="-* /etc/locale.gen" |
| 32 |
|
| 33 |
echo "$locales" > /etc/locale.gen |
| 34 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 35 |
index 2eb90117..a4074d91 100755 |
| 36 |
--- a/targets/support/chroot-functions.sh |
| 37 |
+++ b/targets/support/chroot-functions.sh |
| 38 |
@@ -78,17 +78,17 @@ get_libdir() { |
| 39 |
|
| 40 |
setup_features() { |
| 41 |
setup_emerge_opts |
| 42 |
- export features="-news binpkg-multi-instance clean-logs parallel-install" |
| 43 |
+ local features="-news binpkg-multi-instance clean-logs parallel-install" |
| 44 |
export FEATURES="${features}" |
| 45 |
if [ -n "${clst_CCACHE}" ] |
| 46 |
then |
| 47 |
- export features="${features} ccache" |
| 48 |
+ features="${features} ccache" |
| 49 |
clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1 |
| 50 |
fi |
| 51 |
|
| 52 |
if [ -n "${clst_DISTCC}" ] |
| 53 |
then |
| 54 |
- export features="${features} distcc" |
| 55 |
+ features="${features} distcc" |
| 56 |
export DISTCC_HOSTS="${clst_distcc_hosts}" |
| 57 |
[ -e ${clst_make_conf} ] && \ |
| 58 |
echo 'USE="${USE} -avahi -gtk -gnome"' >> ${clst_make_conf} |
| 59 |
-- |
| 60 |
2.26.2 |
Archives