Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 34/37] targets: Merge setup_gk_args() and genkernel_compile()
Date: Wed, 21 Oct 2020 00:24:57
Message-Id: 20201021002344.378131-34-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 These both just do a bunch of argument concatenation and are not
2 separate functions in any meaningful way.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 targets/support/kmerge.sh | 6 +-----
7 1 file changed, 1 insertion(+), 5 deletions(-)
8
9 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
10 index 27584d51..6a0137d7 100755
11 --- a/targets/support/kmerge.sh
12 +++ b/targets/support/kmerge.sh
13 @@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
14
15 install -d /tmp/kerncache
16
17 -setup_gk_args() {
18 +genkernel_compile() {
19 # default genkernel args
20 GK_ARGS=(
21 "${kernel_gk_kernargs[@]}"
22 @@ -61,10 +61,6 @@ setup_gk_args() {
23 then
24 GK_ARGS+=(--loglevel=2)
25 fi
26 -}
27 -
28 -genkernel_compile(){
29 - setup_gk_args
30
31 # Build with genkernel using the set options
32 # callback is put here to avoid escaping issues
33 --
34 2.26.2