From 3db4cc73509f5b624f48603e80e53d7fff0d5fe3 Mon Sep 17 00:00:00 2001 From: Robert Joslyn Date: Tue, 4 Feb 2020 20:23:08 -0800 Subject: iwd: Use manpages class to control documentation This class allows the api-documentation distro feature to control man page generation. Remove copying all .txt files from ${S}/doc since these are developer documents and wouldn't be of any use to users on the target device. Signed-off-by: Robert Joslyn Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb index cfced50a0e..9d63e5b73b 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Wireless daemon for Linux" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -inherit autotools pkgconfig systemd python3native +inherit autotools manpages pkgconfig systemd python3native DEPENDS = "ell" @@ -16,12 +16,11 @@ S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ client \ monitor \ - manual-pages \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manual-pages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" @@ -33,8 +32,6 @@ do_configure_prepend () { } do_install_append() { - mkdir --parents ${D}${docdir}/${BPN} - install -m644 ${S}/doc/*.txt ${D}${docdir}/${BPN} # If client and monitor are disabled, bindir is empty, causing a QA error rmdir --ignore-fail-on-non-empty ${D}/${bindir} } -- cgit v1.2.3-54-g00ecf