| 1 |
commit: 35a3cfc97b35b5a4005f8f6a835e323321d06734 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 14 05:34:23 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 14 05:34:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=35a3cfc9 |
| 7 |
|
| 8 |
kmerge.sh: Handle gk_kernargs with spaces |
| 9 |
|
| 10 |
The ppc livecd specs contain |
| 11 |
|
| 12 |
boot/kernel/G5/gk_kernargs: --kernel-cc='gcc -m64' --kernel-ld='ld -m elf64ppc' --kernel-as='as -a64' |
| 13 |
|
| 14 |
And the eval converted that into a sequence of arguments separated by |
| 15 |
spaces, ultimately resulting in '--kernel-cc=gcc' '-m64' being passed to |
| 16 |
genkernel, breaking the build. |
| 17 |
|
| 18 |
Thanks a ton to James Le Cuirot <chewi <AT> gentoo.org> and Doug Freed |
| 19 |
<dwfreed <AT> mtu.edu> for their help in debugging this. The credit goes to |
| 20 |
James for coming up with this fix. |
| 21 |
|
| 22 |
targets/support/kmerge.sh | 2 +- |
| 23 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 24 |
|
| 25 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 26 |
index 029b2a33..429e6a98 100755 |
| 27 |
--- a/targets/support/kmerge.sh |
| 28 |
+++ b/targets/support/kmerge.sh |
| 29 |
@@ -144,7 +144,7 @@ filtered_kname=${clst_kname/\//_} |
| 30 |
filtered_kname=${filtered_kname/\./_} |
| 31 |
|
| 32 |
eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use" |
| 33 |
-eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs" |
| 34 |
+eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${filtered_kname}_gk_kernargs ) |
| 35 |
eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources" |
| 36 |
|
| 37 |
if [ -z "${clst_ksource}" ] |
Archives