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 A00D9138359 for ; Wed, 21 Oct 2020 00:24:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0F98E0A5A; Wed, 21 Oct 2020 00:24:14 +0000 (UTC) Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) (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 C6526E0A5A for ; Wed, 21 Oct 2020 00:24:14 +0000 (UTC) Received: by mail-pj1-f65.google.com with SMTP id ds1so219058pjb.5 for ; Tue, 20 Oct 2020 17:24:14 -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=CFhc8M7xQL2K97Z7Gdoo+iCmDI8rN46SqJ1xZrDsfhU=; b=SzNgLxouP1pWQf8MDLJI9u/H2Sf/wnRSq9nP+5Hjt4xTs/aPD/XzAFZQ0oZmpoaFZZ OIbUNGLiXT5PTnsN6Vv+aWJVJ+cvM2VItK3C0m7kk7ZMWageeM7VbImVZmCYpfK93T/y 6newV7WlbmpnsOXfiPSSRB3VJaTuARW4fs6ItrhwuabWNbiboRMNki+Dml72z0czoinO gSodrEI3OqHp7yFM3D4E9pH9MSr/XT9ccGpuMOemsEFN2yZ3TwPT1FIoRj35KTunRJar oVvfBCoNb9VteDwelCpc1u7FR7vOiuxYsz1GiBqGVljzT45laASiGKDkYjSbKuS3wriJ LQ0Q== X-Gm-Message-State: AOAM531SZVvHZpKkS/zeRkRqJbbGRvEgwskjz6m3EOurJmCcgMqvSwqq 9xDdPNRgbxAKb0PRudiU0rPeQk6lEjxclA== X-Google-Smtp-Source: ABdhPJxvMQo/TKtmFKqOWmIcJzRVKikefwmm9Y9p8JqOriSoj/00lQL2wIAC8EVdE15X8BV+HNzoPQ== X-Received: by 2002:a17:902:ea8c:b029:d2:8abd:c8de with SMTP id x12-20020a170902ea8cb02900d28abdc8demr786453plb.21.1603239853552; Tue, 20 Oct 2020 17:24:13 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id e7sm274108pgj.19.2020.10.20.17.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 17:24:12 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 10/37] targets: Remove trivial build_kernel() function Date: Tue, 20 Oct 2020 17:23:17 -0700 Message-Id: <20201021002344.378131-10-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: f1dfa66f-864d-4695-bbaf-5483a9c40d6c X-Archives-Hash: 95b460f5c25407c8d478717cb989d1b6 Signed-off-by: Matt Turner --- targets/support/kmerge.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index b4c3963a..bcc83cd6 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -111,10 +111,6 @@ genkernel_compile(){ fi } -build_kernel() { - genkernel_compile -} - [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript export CONFIG_PROTECT="-*" @@ -268,7 +264,8 @@ fi make_destpath -build_kernel +genkernel_compile + sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf} # grep out the kernel version so that we can do our modules magic VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'` -- 2.26.2