From d953260f98281a288460647141364653d1d63a40 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Wed, 28 Aug 2024 14:46:59 +0200 Subject: [PATCH] config/env/sys-fs/zfs-kmod: un-break zfs-kmod binpkg install This change sets SKIP_KERNEL_BINPKG_ENV_RESET in the zfs-kmod env so linux-info.eclass keeps kernel env variables. This resolves an issue with installing zfs-kmod as a binpkg when the kernel was not yet installed. In a pure binpkg install the zfs-kmod package might be installed before the kernel, leading to the kmod's kernel version detection to fail. Signed-off-by: Thilo Fromm --- .../coreos-overlay/coreos/config/env/sys-fs/zfs-kmod | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod index d9059b9386..5f7fa2a9a8 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod @@ -1,6 +1,11 @@ : ${MODULES_ROOT:=$(echo ${SYSROOT}/lib/modules/*)} KERNEL_DIR="${MODULES_ROOT}/build" +# This addresses an issue with the kernel version compatibility check +# when installing zfs-kmod to /build/ (e.g. via build_packages) +# from its binpkg (i.e. not recompiling it). +SKIP_KERNEL_BINPKG_ENV_RESET=1 + # Necessary to prevent KV_FULL & KV_OUT_DIR from being unset # when building Kernel modules for sysext. See also eclass/linux-info.eclass. cros_pre_pkg_setup_kernel_version() {