From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local
Date: Sat, 16 May 2020 12:10:32 -0700 [thread overview]
Message-ID: <20200516121032.7e2cf133@storm> (raw)
In-Reply-To: <20200516065317.2678080-2-mattst88@gentoo.org>
On Fri, 15 May 2020 23:53:10 -0700
Matt Turner <mattst88@gentoo.org> wrote:
> Signed-off-by: Matt Turner <mattst88@gentoo.org>
> ---
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}
next prev parent reply other threads:[~2020-05-16 19:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-16 6:53 [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Matt Turner
2020-05-16 19:10 ` Brian Dolbec [this message]
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 3/9] targets: Use arrays rather than string concatenation Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 4/9] targets: Drop duplicate FEATURES=-news Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 6/9] targets: Remove || exit 1 from run_merge invocations Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages Matt Turner
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Matt Turner
2020-05-16 19:16 ` Brian Dolbec
2020-05-16 6:53 ` [gentoo-catalyst] [PATCH 9/9] catalyst: Remove fbsplash support Matt Turner
2020-05-16 19:20 ` Brian Dolbec
2020-05-16 19:01 ` [gentoo-catalyst] [PATCH 1/9] targets: Remove clst_my* prefix Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200516121032.7e2cf133@storm \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox