summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2024-05-09 19:33:00 +0200
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2024-05-17 14:06:47 +0200
commit7ca8ee3261f35705fbe94af7688e41815b42c0e6 (patch)
treee63f22a1633095e2fd77da9a0efc291a4d0e1f1c
parentlinux-info.eclass: respect eselect kernel setting in binpkgs (diff)
downloadgentoo-7ca8ee3261f35705fbe94af7688e41815b42c0e6.tar.gz
gentoo-7ca8ee3261f35705fbe94af7688e41815b42c0e6.tar.bz2
gentoo-7ca8ee3261f35705fbe94af7688e41815b42c0e6.zip
linux-mod-r1.eclass: do not reset kernel env vars in binpkgs
Closes: https://bugs.gentoo.org/931213 Bug: https://bugs.gentoo.org/926063 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/36597 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
-rw-r--r--eclass/linux-mod-r1.eclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/eclass/linux-mod-r1.eclass b/eclass/linux-mod-r1.eclass
index d9651f962604..6060074d8734 100644
--- a/eclass/linux-mod-r1.eclass
+++ b/eclass/linux-mod-r1.eclass
@@ -661,6 +661,11 @@ _modules_check_migration() {
# Handles linux-info bits to provide usable sources, KV_ variables,
# and CONFIG_CHECK use.
_modules_prepare_kernel() {
+ # The modules we build are specific to each kernel version, we don't
+ # want to reset the environment to use the user selected kernel version.
+ # Bug 931213, 926063
+ SKIP_KERNEL_BINPKG_ENV_RESET=1
+
get_version
# linux-info allows skipping checks if SKIP_KERNEL_CHECK is set and