commit: 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 06:12:21 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:49:46 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421d73ea
targets: Don't unnecessarily override emerge_opts
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 <AT> 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 ]
