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