From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1216951-garchives=archives.gentoo.org@lists.gentoo.org>
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 49E69138359
for <garchives@archives.gentoo.org>; Thu, 22 Oct 2020 18:06:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 54336E0855;
Thu, 22 Oct 2020 18:06:25 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 3FDAAE0855
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2020 18:06:25 +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 4E5E4340BE3
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2020 18:06:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 918203B8
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Oct 2020 18:06:21 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
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" <mattst88@gentoo.org>
Message-ID: <1603236395.6cac6a666a7ab8fec2dc966ed62b827f9f8b7d44.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: 6cac6a666a7ab8fec2dc966ed62b827f9f8b7d44
X-VCS-Branch: pending/mattst88
Date: Thu, 22 Oct 2020 18:06:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d03ca484-b2ed-494d-9ce7-4b1098a70bf2
X-Archives-Hash: 3bdbe1696e88ffac634bee9808d85c46
Message-ID: <20201022180621.-38RPcvy8burs5GbktTtrdeZu0r3wFHl41zwRv8yuWc@z>
commit: 6cac6a666a7ab8fec2dc966ed62b827f9f8b7d44
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 23:26:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6cac6a66
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 27584d51..6a0137d7 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