From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1653344-garchives=archives.gentoo.org@lists.gentoo.org> 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 B64D21581C1 for <garchives@archives.gentoo.org>; Mon, 15 Jul 2024 19:18:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1F97E2A6F; Mon, 15 Jul 2024 19:18:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A47F4E2A6F for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jul 2024 19:18:24 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAD72340940 for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jul 2024 19:18:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAEB11E35 for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jul 2024 19:18:20 +0000 (UTC) From: "Andrew Ammerlaan" <andrewammerlaan@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, "Andrew Ammerlaan" <andrewammerlaan@gentoo.org> Message-ID: <1721071027.fa0ab4edb83c6e9ca7729ca847fdf60bfd051fb0.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: fa0ab4edb83c6e9ca7729ca847fdf60bfd051fb0 X-VCS-Branch: master Date: Mon, 15 Jul 2024 19:18:20 +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: f6736379-7c2c-4537-a9f5-d569b247db92 X-Archives-Hash: 688e43e3772695230ac12825bc9f1856 commit: fa0ab4edb83c6e9ca7729ca847fdf60bfd051fb0 Author: James Calligeros <jcalligeros99 <AT> gmail <DOT> com> AuthorDate: Sat Jun 29 01:55:12 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Mon Jul 15 19:17:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0ab4ed kernel-build.eclass: sanity check the prepared kernel's release string Previously, this was only checked by kernel-install_pkg_preinst(). This means that the entire kernel would have to be built and stripped before we knew if we had built the correct kernel or not. Duplicate this check in kernel-build_src_configure() so that we don't waste time and energy building an incorrectly-versioned kernel. Signed-off-by: James Calligeros <jcalligeros99 <AT> gmail.com> Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> eclass/kernel-build.eclass | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 89167124802b..9ddc7793d6e6 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -239,6 +239,19 @@ kernel-build_src_configure() { local relfile=${WORKDIR}/build/include/config/kernel.release KV_FULL=$(<"${relfile}") || die fi + + # Make sure we are about to build the correct kernel + if [[ ${PV} != *9999 ]]; then + local expected_ver=$(dist-kernel_PV_to_KV "${PV}") + + if [[ ${KV_FULL} != ${expected_ver}* ]]; then + eerror "Kernel version does not match PV!" + eerror "Source version: ${KV_FULL}" + eerror "Expected (PV*): ${expected_ver}*" + eerror "Please ensure you are applying the correct patchset." + die "Kernel version mismatch: got ${KV_FULL}, expected ${expected_ver}*" + fi + fi } # @FUNCTION: kernel-build_src_compile