From a86985f890bef6a22e57f754e184ac8f5c59ce9c Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Thu, 5 Feb 2015 20:24:53 +0200 Subject: neard: upgrade to 0.15 - parallel-build.patch patch removed, included upstream; - systemd unit files provided by neard, YP-provided removed; - improved systemd support. Signed-off-by: Cristian Iorga Signed-off-by: Ross Burton --- meta/recipes-connectivity/neard/neard.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta/recipes-connectivity/neard/neard.inc') diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc index 76640d8a1a..31bc6ddb66 100644 --- a/meta/recipes-connectivity/neard/neard.inc +++ b/meta/recipes-connectivity/neard/neard.inc @@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ inherit autotools pkgconfig systemd update-rc.d +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" + EXTRA_OECONF += "--enable-tools" do_install() { @@ -26,12 +30,6 @@ do_install_append() { chmod 0755 ${D}${sysconfdir}/init.d/neard fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${systemd_unitdir}/system - sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \ - > ${D}${systemd_unitdir}/system/neard.service - fi - # Install the tests for neard-tests install -d ${D}${libdir}/neard install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/ -- cgit 1.2.3-korg