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