From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8BEB713835A for ; Sat, 16 May 2020 06:55:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4461E09D9; Sat, 16 May 2020 06:55:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9BA74E09D9 for ; Sat, 16 May 2020 06:55:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F4B834F0FE for ; Sat, 16 May 2020 06:55:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E0B1232 for ; Sat, 16 May 2020 06:55:30 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589609868.8569a25ab4d9fafa03684554e4fbfc80f8968d06.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage2/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh targets/stage2/chroot.sh targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ targets/stage2/ targets/stage1/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 8569a25ab4d9fafa03684554e4fbfc80f8968d06 X-VCS-Branch: wip/mattst88 Date: Sat, 16 May 2020 06:55:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 73b3a375-4c39-4a2b-b130-1252e0f809a7 X-Archives-Hash: df1e70a70444287f359e460126b20ea7 Message-ID: <20200516065530.ssLQCBkapwTaovMN5btZN-K7uZid0VN4g3zWU-LRXH8@z> commit: 8569a25ab4d9fafa03684554e4fbfc80f8968d06 Author: Matt Turner gentoo org> AuthorDate: Sat May 16 05:32:49 2020 +0000 Commit: Matt Turner gentoo 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 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}