From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 5/9] targets: Don't unnecessarily override emerge_opts
Date: Fri, 15 May 2020 23:53:13 -0700 [thread overview]
Message-ID: <20200516065317.2678080-5-mattst88@gentoo.org> (raw)
In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org>
emerge_opts contains the options we want already, and if there are extra
options we need for a special case we can just pass them to run_merge.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/support/kmerge.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 23489d8e..e92072bb 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -212,7 +212,7 @@ then
# install dependencies of kernel sources ahead of time in case
# package.provided generated below causes them not to be (re)installed
- PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1
# Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
@@ -236,7 +236,7 @@ then
[ -L /usr/src/linux ] && rm -f /usr/src/linux
- PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1
+ PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1
SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
if [ -L /usr/src/linux ]
--
2.26.2
next prev parent reply other threads:[~2020-05-16 6:53 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
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 ` Matt Turner [this message]
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=20200516065317.2678080-5-mattst88@gentoo.org \
--to=mattst88@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