diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2024-03-09 14:16:26 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2024-03-11 20:38:27 -0400 |
| commit | f51cd5b64c14ddfb83488a12d538c66a4a309376 (patch) | |
| tree | af6a286ea2c10dac42609356506aded584dc6df6 | |
| parent | toolchain.eclass: handle quoted whitespace in EXTRA_ECONF (diff) | |
| download | gentoo-f51cd5b64c14.tar.gz gentoo-f51cd5b64c14.tar.bz2 gentoo-f51cd5b64c14.zip | |
linux-info.eclass: improve binpkg handling
When installing a binpkg, Portage will restore the ebuild environment
from when the binpkg was built. The stored values for KV_* may be
different from the values that would be detected on the current system.
To work around this, unset some key variables in
linux-info_get_any_version when MERGE_TYPE == binary.
Also, only look for the running kernel version: we can't possibly need
a full kernel source tree when installing a package that has already
been compiled. This gives a nice speedup as well.
Closes: https://bugs.gentoo.org/926063
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | eclass/linux-info.eclass | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index d0a3c96e6b05..864594f607ca 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: linux-info.eclass @@ -696,11 +696,17 @@ linux-info_get_any_version() { die "${FUNCNAME}() called on non-Linux system, please fix the ebuild" fi - if ! get_version; then + if [[ ${MERGE_TYPE} == binary && -z ${LINUX_INFO_BINARY_RESET} ]]; then + unset KV_FULL _LINUX_CONFIG_EXISTS_DONE KV_OUT_DIR + LINUX_INFO_BINARY_RESET=1 + fi + + if [[ ${MERGE_TYPE} != binary ]] && ! get_version; then ewarn "Unable to calculate Linux Kernel version for build, attempting to use running version" - if ! get_running_version; then - die "Unable to determine any Linux Kernel version, please report a bug" - fi + fi + + if [[ -z ${KV_FULL} ]] && ! get_running_version; then + die "Unable to determine any Linux Kernel version, please report a bug" fi } |