commit: 95818db5546dbecc0818f8ceaabd421e579a785b Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Oct 2 20:17:12 2018 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Oct 2 20:18:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=95818db5
kmerge.sh: make gk_mainargs optional Since 8c58b6b1221a1b8d990a30dd8e2be18c5725ef76, omitting target/gk_mainargs in specs supporting it will cause an empty '' argument to be passed to genkernel. Genkernel will fail hard on this. With this fix, we'll only append ${clst_gk_mainargs} to the GK_ARGS array ${clst_gk_mainargs} is actually set. targets/support/kmerge.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 429e6a98..a2ebe093 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -10,7 +10,6 @@ PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds setup_gk_args() { # default genkernel args GK_ARGS=( - "${clst_gk_mainargs}" "${clst_kernel_gk_kernargs[@]}" --cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} --no-mountboot @@ -19,6 +18,10 @@ setup_gk_args() { --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all ) # extra genkernel options that we have to test for + if [ -n "${clst_gk_mainargs}" ] + then + GK_ARGS+=("${clst_gk_mainargs}") + fi if [ -n "${clst_KERNCACHE}" ] then GK_ARGS+=(--kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2)