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 A9A011581C1 for ; Mon, 15 Jul 2024 19:18:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D944E2AAA; Mon, 15 Jul 2024 19:18:25 +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 4DD18E2AAA for ; Mon, 15 Jul 2024 19:18:25 +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 51D84340943 for ; Mon, 15 Jul 2024 19:18:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EF351E37 for ; Mon, 15 Jul 2024 19:18:21 +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: <1721071029.f2ba59930f7c125a321b2de19d1e9b52158b06bd.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-install.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: f2ba59930f7c125a321b2de19d1e9b52158b06bd X-VCS-Branch: master Date: Mon, 15 Jul 2024 19:18:21 +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: a78abae2-aa74-47d8-927a-408c1f19589d X-Archives-Hash: b59c046959930b0f882c3dc30dfc210b commit: f2ba59930f7c125a321b2de19d1e9b52158b06bd Author: James Calligeros gmail com> AuthorDate: Sat Jul 13 12:47:33 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Jul 15 19:17:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ba5993 kernel-install.eclass: improve kernel version check Now that we have an improved version check in kernel-build.eclass, copy it here so that the two eclasses match. Signed-off-by: James Calligeros gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37327 Signed-off-by: Andrew Ammerlaan gentoo.org> eclass/kernel-install.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index a90eae86123c..e6f0b404dcaa 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -610,11 +610,11 @@ kernel-install_pkg_preinst() { local expected_ver=$(dist-kernel_PV_to_KV "${PV}") if [[ ${KV_FULL} != ${expected_ver}* ]]; then - eerror "Kernel release mismatch!" - eerror " expected (PV): ${expected_ver}*" - eerror " found: ${KV_FULL}" - eerror "Please verify that you are applying the correct patches." - die "Kernel release mismatch (${KV_FULL} instead of ${expected_ver}*)" + 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