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