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 B0EC7138359 for ; Wed, 21 Oct 2020 00:24:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14F6BE0ACB; Wed, 21 Oct 2020 00:24:57 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 EA894E0ACB for ; Wed, 21 Oct 2020 00:24:56 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id o9so276378plx.10 for ; Tue, 20 Oct 2020 17:24:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VdN6cn/mwPiFvQi39spCgkqlvi18lgjqPzwlxPBOxQQ=; b=nJncC/36IiZD8NKI8DcMZL0Lc4OFkl0v5cU3b1GMaHAMhJ/bjJOzECUAoWtUJacdu4 F0rdchmkoUceboUfaHK59h257CzHNko3b1Ut4ugFvpNkAdED0HFyKU3B7Y6sPudmX9xk hLoQHIO84S9oCyM5pN2PsdiyFODaAW92tmDABCulZRjDKDIUip4aGAMbaH8Y3EEQ8JQ7 olILJE3rJqnn2CtcBX1n0hrd5l2hX0j9Gp+YEC4M1OLLM900bNnnKPjaA3Hb90eZE3xM 2v8adMs5bTylAgsZ1/XbkykyQSJdO9sLxSsT0dOQLYre4jLcCqptH28pGD+QAmYblsc7 KwzA== X-Gm-Message-State: AOAM532W6272QiM4Os4Mg8dnQnPhlrj8i9sE//EbcJQn5COQzZP6ln6E d48Xyx/9KTrAN9IwcDzsY/abkbsJEEXDPg== X-Google-Smtp-Source: ABdhPJwQIXCUVYKMwd9jv0b51IPIuAbdvZZvkeRDGUP4jjYHLLkqbFjI8qEOhEGAFUKY8fmGI/914A== X-Received: by 2002:a17:90a:ff92:: with SMTP id hf18mr630599pjb.171.1603239895679; Tue, 20 Oct 2020 17:24:55 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id w12sm176876pfu.53.2020.10.20.17.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:54 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 34/37] targets: Merge setup_gk_args() and genkernel_compile() Date: Tue, 20 Oct 2020 17:23:41 -0700 Message-Id: <20201021002344.378131-34-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021002344.378131-1-mattst88@gentoo.org> References: <20201021002344.378131-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 3831d314-794b-4f39-b937-be639ce24d02 X-Archives-Hash: 00ed6cfcbaa78bf391981cf7995b66a7 These both just do a bunch of argument concatenation and are not separate functions in any meaningful way. Signed-off-by: Matt Turner --- 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 -- 2.26.2