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 473251382C5 for ; Sat, 16 May 2020 19:10:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48E20E0A9C; Sat, 16 May 2020 19:10:36 +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 2CAACE0A9C for ; Sat, 16 May 2020 19:10:35 +0000 (UTC) Date: Sat, 16 May 2020 12:10:32 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Message-ID: <20200516121032.7e2cf133@storm> In-Reply-To: <20200516065317.2678080-2-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> <20200516065317.2678080-2-mattst88@gentoo.org> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 72a137f3-c43e-4fd0-a0e9-7ab4c555fecb X-Archives-Hash: 7e442f7f1e58e88354c22dfb45416dcd On Fri, 15 May 2020 23:53:10 -0700 Matt Turner wrote: > Signed-off-by: Matt Turner > --- The diff wasn't clear on this one... needed to look at the code a bit.. yes, is good > 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}