diff options
author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-01-22 17:54:22 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-01-24 18:20:06 -0800 |
commit | de66c7127764c3ebbc6cd02317ed94caa68f40c5 (patch) | |
tree | f2e504cea7fb722cd71f992f551167dcbd2fd512 | |
parent | 23e6533f2be0b7c3b0ddbf0380f53ba96a9c0fbc (diff) | |
download | meta-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.bb | 2 |
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" | |||
25 | PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" | 25 | PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" |
26 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" | 26 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" |
27 | PACKAGECONFIG[tests] = "-Dtest=enabled -Ddestructive=enabled, -Dtest=disabled," | 27 | PACKAGECONFIG[tests] = "-Dtest=enabled -Ddestructive=enabled, -Dtest=disabled," |
28 | PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native" | 28 | PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=disabled,-Ddocs=disabled, asciidoc-native xmlto-native" |
29 | 29 | ||
30 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 30 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
31 | SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service" | 31 | SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service" |