summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/neard/neard.inc
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-02-05 20:24:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-08 08:00:29 +0000
commit3145abf0789415a1a6e42780e9d5cf2684c8030a (patch)
tree05216a0a3886ea0531011e16d338ed20130240f4 /meta/recipes-connectivity/neard/neard.inc
parent4530a8f4efa9979eed5fdf4ac773d6335953a94c (diff)
downloadpoky-3145abf0789415a1a6e42780e9d5cf2684c8030a.tar.gz
neard: upgrade to 0.15
- parallel-build.patch patch removed, included upstream; - systemd unit files provided by neard, YP-provided removed; - improved systemd support. (From OE-Core rev: a86985f890bef6a22e57f754e184ac8f5c59ce9c) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/neard/neard.inc')
-rw-r--r--meta/recipes-connectivity/neard/neard.inc10
1 files changed, 4 insertions, 6 deletions
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 \
11 11
12inherit autotools pkgconfig systemd update-rc.d 12inherit autotools pkgconfig systemd update-rc.d
13 13
14PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
15
16PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
17
14EXTRA_OECONF += "--enable-tools" 18EXTRA_OECONF += "--enable-tools"
15 19
16do_install() { 20do_install() {
@@ -26,12 +30,6 @@ do_install_append() {
26 chmod 0755 ${D}${sysconfdir}/init.d/neard 30 chmod 0755 ${D}${sysconfdir}/init.d/neard
27 fi 31 fi
28 32
29 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
30 install -d ${D}${systemd_unitdir}/system
31 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
32 > ${D}${systemd_unitdir}/system/neard.service
33 fi
34
35 # Install the tests for neard-tests 33 # Install the tests for neard-tests
36 install -d ${D}${libdir}/neard 34 install -d ${D}${libdir}/neard
37 install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/ 35 install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/