From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC6A4138359 for ; Tue, 20 Oct 2020 02:50:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE4C2E0855; Tue, 20 Oct 2020 02:50:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D39E2E0863 for ; Tue, 20 Oct 2020 02:50:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD11B335D24 for ; Tue, 20 Oct 2020 02:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FCD73C7 for ; Tue, 20 Oct 2020 02:50:18 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603162208.86cbba5c3dfd16f40648d8185d8e002c88217b80.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 86cbba5c3dfd16f40648d8185d8e002c88217b80 X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 02:50:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 80f4208d-9c64-4c3d-8f4d-9ac03cbd671e X-Archives-Hash: 5822e1c8087ef3c1fe5ec5abcf38edf8 commit: 86cbba5c3dfd16f40648d8185d8e002c88217b80 Author: Matt Turner gentoo org> AuthorDate: Tue Oct 20 01:33:30 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 02:50:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=86cbba5c 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 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 76d263ba..6bdce30a 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