From 741c9270dd3ac8ee09333ace2cff5173802c64dc Mon Sep 17 00:00:00 2001 From: Michael Everitt <m.j.everitt@iee.org> Date: Fri, 20 Apr 2018 14:47:35 +0100 Subject: [PATCH] Remove redundant '--quiet' option on kernel emerges run_merge handles quiet/verbose emerges internally, so this override is unnecessary/inappropriate --- 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 dfdb637c..9570bc77 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -207,7 +207,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} clst_myemergeopts="--quiet --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} clst_myemergeopts="--update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1 # Create the kerncache directory if it doesn't exists mkdir -p /tmp/kerncache/${clst_kname} @@ -231,7 +231,7 @@ then [ -L /usr/src/linux ] && rm -f /usr/src/linux - PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1 + PKGDIR=${PKGDIR} clst_myemergeopts="--update --newuse" run_merge "${clst_ksource}" || exit 1 SOURCESDIR="/tmp/kerncache/${clst_kname}/sources" if [ -L /usr/src/linux ] -- 2.13.0