1 |
commit: 7183c82189dcfdaf514ce54f3e688fe1d05c4402 |
2 |
Author: Nic Boet <nic <AT> boet <DOT> cc> |
3 |
AuthorDate: Mon Jul 19 03:00:55 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 19 03:03:10 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7183c821 |
7 |
|
8 |
targets: Pass gk_callback_opts as a string instead of array |
9 |
|
10 |
Fixes: e5855bef ("targets: Use arrays rather than string concatenation") |
11 |
Signed-off-by: Nic Boet <nic <AT> boet.cc> |
12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
13 |
|
14 |
targets/support/kmerge.sh | 3 ++- |
15 |
1 file changed, 2 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
18 |
index fb67aba6..20b471f1 100755 |
19 |
--- a/targets/support/kmerge.sh |
20 |
+++ b/targets/support/kmerge.sh |
21 |
@@ -60,7 +60,8 @@ genkernel_compile() { |
22 |
fi |
23 |
|
24 |
if [[ -n ${kernel_merge} ]]; then |
25 |
- genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \ |
26 |
+ gk_callback=${gk_callback_opts[@]} |
27 |
+ genkernel --callback="emerge ${gk_callback} ${kernel_merge}" \ |
28 |
"${GK_ARGS[@]}" || exit 1 |
29 |
else |
30 |
genkernel "${GK_ARGS[@]}" || exit 1 |