summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2025-01-22 17:54:22 +0100
committerKhem Raj <raj.khem@gmail.com>2025-01-24 18:20:06 -0800
commitde66c7127764c3ebbc6cd02317ed94caa68f40c5 (patch)
treef2e504cea7fb722cd71f992f551167dcbd2fd512
parent23e6533f2be0b7c3b0ddbf0380f53ba96a9c0fbc (diff)
downloadmeta-openembedded-de66c7127764c3ebbc6cd02317ed94caa68f40c5.tar.gz
ndctl: fix building documentation
In case "asciidoctor" meson option is enabled for building the documentation, meson looks for a binary called "asciidoctor", which is a ruby application, different from "asciidoc", and fails with the following error: ../git/meson.build:153:15: ERROR: Program 'asciidoctor' not found or not executable When "asciidoctor" option is disabled, meson looks for "asciidoc", which is readily provided by asciidoc-native. When docs PACKAGECONFIG is disabled, the "asciidoctor" option can be left on its default value. Also, add xmlto-native as a dependency for the "docs" PACKAGECONFIG, otherwise build fails with the following error after finding asciidoc: ../git/meson.build:156:12: ERROR: Program 'xmlto' not found or not executable 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.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/ndctl/ndctl_v79.bb b/meta-oe/recipes-core/ndctl/ndctl_v79.bb
index 90f6d13fdb..1ad1476d93 100644
--- a/meta-oe/recipes-core/ndctl/ndctl_v79.bb
+++ b/meta-oe/recipes-core/ndctl/ndctl_v79.bb
@@ -25,7 +25,7 @@ EXTRA_OEMESON += "-Diniparserdir=${STAGING_INCDIR}/iniparser"
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 -Ddestructive=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=disabled,-Ddocs=disabled, asciidoc-native xmlto-native"
29 29
30SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" 30SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
31SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service" 31SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service"