summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2025-01-22 17:54:21 +0100
committerKhem Raj <raj.khem@gmail.com>2025-01-24 18:20:06 -0800
commit23e6533f2be0b7c3b0ddbf0380f53ba96a9c0fbc (patch)
treeeb37fb3dae2430b1a598af67539e006089b030f2
parent3a3ef736cd8bb26308e3a206647a908f04b375ca (diff)
downloadmeta-openembedded-23e6533f2be0b7c3b0ddbf0380f53ba96a9c0fbc.tar.gz
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 <skandigraun@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/ndctl/ndctl_v79.bb4
1 files 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"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
23EXTRA_OEMESON += "-Ddestructive=enabled -Diniparserdir=${STAGING_INCDIR}/iniparser" 23EXTRA_OEMESON += "-Diniparserdir=${STAGING_INCDIR}/iniparser"
24 24
25PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" 25PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
26PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" 26PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
27PACKAGECONFIG[tests] = "-Dtest=enabled, -Dtest=disabled," 27PACKAGECONFIG[tests] = "-Dtest=enabled -Ddestructive=enabled, -Dtest=disabled,"
28PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native" 28PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native"
29 29
30SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" 30SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"