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>
This commit is contained in:
Gyorgy Sarvari
2025-01-22 17:54:22 +01:00
committed by Khem Raj
parent 23e6533f2b
commit de66c71277
+1 -1
View File
@@ -25,7 +25,7 @@ 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 -Ddestructive=enabled, -Dtest=disabled,"
PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=enabled,-Ddocs=disabled -Dasciidoctor=disabled, asciidoc-native"
PACKAGECONFIG[docs] = "-Ddocs=enabled -Dasciidoctor=disabled,-Ddocs=disabled, asciidoc-native xmlto-native"
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service"