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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 145CD158170 for ; Sun, 21 Jul 2024 13:32:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 055532BC022; Sun, 21 Jul 2024 13:31:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBFAD2BC022 for ; Sun, 21 Jul 2024 13:31:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB37E33C1C1 for ; Sun, 21 Jul 2024 13:31:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28CBB1E48 for ; Sun, 21 Jul 2024 13:31:56 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1721568586.55c2a7a949695e4e70d9246b8418453093f747e4.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 55c2a7a949695e4e70d9246b8418453093f747e4 X-VCS-Branch: master Date: Sun, 21 Jul 2024 13:31:56 +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: aaaa405b-3c19-4566-97e0-8e0b6854c46f X-Archives-Hash: 4225012936e79eaafa29a7893d9a55f0 commit: 55c2a7a949695e4e70d9246b8418453093f747e4 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Jul 21 08:51:47 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Jul 21 13:29:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c2a7a9 kernel-build.eclass: don't check key/cert if merging binary Signed-off-by: Andrew Ammerlaan gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/37640 Signed-off-by: Andrew Ammerlaan gentoo.org> eclass/kernel-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index fa01be28723f..aca387bb5abd 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -131,7 +131,7 @@ fi # Call python-any-r1 and secureboot pkg_setup kernel-build_pkg_setup() { python-any-r1_pkg_setup - if [[ ${KERNEL_IUSE_MODULES_SIGN} ]]; then + if [[ ${KERNEL_IUSE_MODULES_SIGN} && ${MERGE_TYPE} != binary ]]; then secureboot_pkg_setup # Sanity check: fail early if key/cert in DER format or does not exist