commit:     f2ba59930f7c125a321b2de19d1e9b52158b06bd
Author:     James Calligeros <jcalligeros99 <AT> gmail <DOT> com>
AuthorDate: Sat Jul 13 12:47:33 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <jcalligeros99 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37327
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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
 

Reply via email to