[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/

[Matt Turner]

commit:     01b88d370af30a9c77f7755dd86b9a2c09b07c16
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 01:33:30 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 03:55:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=01b88d37

targets: Merge setup_gk_args() and genkernel_compile()

These both just do a bunch of argument concatenation and are not
separate functions in any meaningful way.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b8cc0ce6..a9a2a72a 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
 
 install -d /tmp/kerncache
 
-setup_gk_args() {
+genkernel_compile() {
        # default genkernel args
        GK_ARGS=(
                "${kernel_gk_kernargs[@]}"
@@ -61,10 +61,6 @@ setup_gk_args() {
        then
                GK_ARGS+=(--loglevel=2)
        fi
-}
-
-genkernel_compile(){
-       setup_gk_args
 
        # Build with genkernel using the set options
        # callback is put here to avoid escaping issues