diff mbox series

[meta-oe,27/31] zabbix: Use oe.kernel.get_version_headers

Message ID 20260801214526.788343-27-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-multimedia,01/31] libmatroska: upgrade 1.7.1 -> 1.7.2 | expand

Commit Message

Khem Raj Aug. 1, 2026, 9:45 p.m. UTC
oe-core commit b980106560 ("lib/oe/kernel: Move python functions from
linux-kernel-base to library code") moved the kernel helpers out of
linux-kernel-base.bbclass into meta/lib/oe/kernel.py and renamed them from
get_kernelXXX to oe.kernel.get_XXX. In-tree users were updated, out of tree
layers were not, so parsing now fails:

  ExpansionError: Failure expanding variable KERNEL_VERSION, expression was
  ${@get_kernelversion_headers('.../work-shared/raspberrypi4-64/kernel-source')}
  which triggered exception NameError: name 'get_kernelversion_headers' is not defined
  The variable dependency chain for the failure is: KERNEL_VERSION -> do_configure

Switch to the new name. The functions now live in the oe library, which is
always available in python expressions, so the linux-kernel-base inherit is no
longer needed -- it only exports KBUILD_BUILD_* now, which is of no use here,
and upstream intends to remove the class entirely.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-connectivity/zabbix/zabbix_7.0.29.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.29.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.29.bb
index 8707d65bb3..a7e617fa59 100644
--- a/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.29.bb
+++ b/meta-oe/recipes-connectivity/zabbix/zabbix_7.0.29.bb
@@ -29,7 +29,7 @@  SRC_URI = "https://cdn.zabbix.com/zabbix/sources/stable/7.0/${BPN}-${PV}.tar.gz
 "
 SRC_URI[sha256sum] = "184d03454d7ff2d49fa1d292082ad335bce907ba22e30d54035d05329708ce32"

-inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd
+inherit autotools-brokensep pkgconfig systemd useradd

 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "zabbix-agent.service"
@@ -41,7 +41,7 @@  USERADD_PARAM:${PN} = "-r -g zabbix -d /var/lib/zabbix \
     -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \
 "

-KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}"
+KERNEL_VERSION = "${@oe.kernel.get_version_headers('${STAGING_KERNEL_DIR}')}"

 EXTRA_OECONF = " \
     --enable-dependency-tracking \