From 23e6533f2be0b7c3b0ddbf0380f53ba96a9c0fbc Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Wed, 22 Jan 2025 17:54:21 +0100 Subject: [PATCH] ndctl: fix compiling without including tests In case "tests" PACKAGECONFIG is not included, do_configure fails with the following error message: ../git/ndctl/meson.build:51:4: ERROR: Problem encountered: '-D=destructive=enabled' requires '-Dtest=enabled' Since "destructive" option only enables an extra set of tests, it only makes sense to use along with including the tests. In case tests are not required, this option can be left on its default value (disabled). Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- meta-oe/recipes-core/ndctl/ndctl_v79.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/ndctl/ndctl_v79.bb b/meta-oe/recipes-core/ndctl/ndctl_v79.bb index 9a4bc49d12..90f6d13fdb 100644 --- a/meta-oe/recipes-core/ndctl/ndctl_v79.bb +++ b/meta-oe/recipes-core/ndctl/ndctl_v79.bb @@ -20,11 +20,11 @@ DEPENDS = "kmod udev json-c keyutils iniparser libtraceevent libtracefs" S = "${WORKDIR}/git" -EXTRA_OEMESON += "-Ddestructive=enabled -Diniparserdir=${STAGING_INCDIR}/iniparser" +EXTRA_OEMESON += "-Diniparserdir=${STAGING_INCDIR}/iniparser" PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" -PACKAGECONFIG[tests] = "-Dtest=enabled, -Dtest=disabled," +PACKAGECONFIG[tests] = "-Dtest=enabled -Ddestructive=enabled, -Dtest=disabled," PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native" SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"