commit:     7ca8ee3261f35705fbe94af7688e41815b42c0e6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 17:33:00 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri May 17 12:06:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca8ee32

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 <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/36597
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 eclass/linux-mod-r1.eclass | 5 +++++
 1 file changed, 5 insertions(+)

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

Reply via email to