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 10/37] targets: Remove trivial build_kernel() function
Date: Wed, 21 Oct 2020 00:24:15
Message-Id: 20201021002344.378131-10-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/37] catalyst: Use early return to unindent code by Matt Turner
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 targets/support/kmerge.sh | 7 ++-----
4 1 file changed, 2 insertions(+), 5 deletions(-)
5
6 diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
7 index b4c3963a..bcc83cd6 100755
8 --- a/targets/support/kmerge.sh
9 +++ b/targets/support/kmerge.sh
10 @@ -111,10 +111,6 @@ genkernel_compile(){
11 fi
12 }
13
14 -build_kernel() {
15 - genkernel_compile
16 -}
17 -
18 [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
19 export CONFIG_PROTECT="-*"
20
21 @@ -268,7 +264,8 @@ fi
22 make_destpath
23
24
25 -build_kernel
26 +genkernel_compile
27 +
28 sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}
29 # grep out the kernel version so that we can do our modules magic
30 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
31 --
32 2.26.2