[oe] [meta-networking][PATCH] dnsmasq: don't expect systemd support to be set
Mark Asselstine
mark.asselstine at windriver.com
Sun Aug 11 02:10:25 UTC 2013
If you don't have 'systemd' set in your DISTRO_FEATURES 'dnsmasq' will
fail to package due to a QA error;
ERROR: QA Issue: dnsmasq: Files/directories were installed but not shipped
/lib
Check for systemd in DISTRO_FEATURES before performing installation
instructions related to systemd.
Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
---
meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 0f5b273..b9e7ff6 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -31,8 +31,10 @@ do_install () {
install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
+ if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
+ fi
if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then
install -d ${D}${sysconfdir}/dbus-1/system.d
--
1.8.1.2
More information about the Openembedded-devel
mailing list