Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/
Date: Thu, 29 Oct 2020 21:00:46
Message-Id: 1603236395.6cac6a666a7ab8fec2dc966ed62b827f9f8b7d44.mattst88@gentoo
1 commit: 6cac6a666a7ab8fec2dc966ed62b827f9f8b7d44
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 20 01:33:30 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 20 23:26:35 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6cac6a66
7
8 targets: Merge setup_gk_args() and genkernel_compile()
9
10 These both just do a bunch of argument concatenation and are not
11 separate functions in any meaningful way.
12
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 targets/support/kmerge.sh | 6 +-----
16 1 file changed, 1 insertion(+), 5 deletions(-)
17
18 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
19 index 27584d51..6a0137d7 100755
20 --- a/targets/support/kmerge.sh
21 +++ b/targets/support/kmerge.sh
22 @@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
23
24 install -d /tmp/kerncache
25
26 -setup_gk_args() {
27 +genkernel_compile() {
28 # default genkernel args
29 GK_ARGS=(
30 "${kernel_gk_kernargs[@]}"
31 @@ -61,10 +61,6 @@ setup_gk_args() {
32 then
33 GK_ARGS+=(--loglevel=2)
34 fi
35 -}
36 -
37 -genkernel_compile(){
38 - setup_gk_args
39
40 # Build with genkernel using the set options
41 # callback is put here to avoid escaping issues