diff options
Diffstat (limited to 'meta/recipes-connectivity/neard/neard.inc')
| -rw-r--r-- | meta/recipes-connectivity/neard/neard.inc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc index e714cadc2b..4042a69b98 100644 --- a/meta/recipes-connectivity/neard/neard.inc +++ b/meta/recipes-connectivity/neard/neard.inc @@ -9,7 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -inherit autotools-brokensep pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d bluetooth + +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" @@ -21,21 +25,15 @@ do_install() { do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ - sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \ + sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ > ${D}${sysconfdir}/init.d/neard 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}/ - install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ + install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ } PACKAGES =+ "${PN}-tests" @@ -47,7 +45,7 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" # Bluez & Wifi are not mandatory except for handover RRECOMMENDS_${PN} = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ " |