diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-05-15 23:12:21 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-05-15 23:49:46 -0700 |
| commit | 421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a (patch) | |
| tree | 5ac7305ea3d1f189918e5ac0d034ce703733ff94 | |
| parent | targets: Drop duplicate FEATURES=-news (diff) | |
| download | catalyst-421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a.tar.gz catalyst-421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a.tar.bz2 catalyst-421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a.zip | |
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@gentoo.org>
| -rwxr-xr-x | targets/support/kmerge.sh | 4 |
1 files 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 ] |