neard: Update reference commit sha1 and install script

This patch installs neard daemon in /usr/lib/neard.

(From OE-Core rev: 415e5bb60bfffe1f3b2acbb3136a45f63bfa91b9)

Signed-off-by: Olivier Guiter <olivier.guiter@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 33 insertions, 13 deletions

diff --git a/meta/recipes-connectivity/neard/neard/neard b/meta/recipes-connectivity/neard/neard/neard.in
index 5f36174d62..a47d4d96c9 100644
--- a/meta/recipes-connectivity/neard/neard/neard
+++ b/meta/recipes-connectivity/neard/neard/neard.in
@@ -1,6 +1,18 @@
 #!/bin/sh
+#
+# start/stop neard daemon.
 
-DAEMON=/usr/sbin/neard
+### BEGIN INIT INFO
+# Provides:          neard
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     S 2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: NFC daemon
+# Description:       neard is a daemon used to enable NFC features
+### END INIT INFO
+
+DAEMON=@installpath@/neard
 PIDFILE=/var/run/neard.pid
 DESC="Linux NFC daemon"
 
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb
index 61ea58cc14..8e33a9da76 100644
--- a/meta/recipes-connectivity/neard/neard_0.9.bb
+++ b/meta/recipes-connectivity/neard/neard_0.9.bb
@@ -11,14 +11,24 @@ inherit autotools pkgconfig update-rc.d
 INITSCRIPT_NAME = "neard"
 INITSCRIPT_PARAMS = "defaults 64"
 
+do_install() {
+        oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
+}
+
 # This would copy neard start-stop shell and test scripts
 do_install_append() {
-  install -d ${D}${sysconfdir}/init.d/
-  install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard
+        # start/stop
+        install -d ${D}${sysconfdir}/init.d/
+
+        sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
+                > ${D}${sysconfdir}/init.d/neard
+
+        chmod 0755 ${D}${sysconfdir}/init.d/neard
 
-  install -d ${D}${libdir}/neard
-  install -m 0755 ${S}/test/* ${D}${libdir}/neard/
-  install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/
+        #test files
+        install -d ${D}${libdir}/neard
+        install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
+        install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
 }
 
 RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
@@ -32,26 +42,24 @@ RRECOMMENDS_${PN} = "\
 #Additional
 PACKAGES =+ "${PN}-tests"
 
-FILES_${PN}-tests = "${libdir}/neard/*-test"
-RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
+FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
+FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
 
-FILES_${PN}-dbg += "${bindir}/neard/*/.debug"
+RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
 
-##=============================
 # This is valid for 0.9+
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
  file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
  "
 S       = "${WORKDIR}/git"
-SRCREV  = "7abdb13d106d496e1115fab49e6448a249dfb3c8"
+SRCREV  = "1e20e396cb837017b7e5ef822bfdab6ce060d2cf"
 PV      = "0.9-git${SRCPV}"
 PR      = "r1"
 
 SRC_URI  = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
-        file://neard \
+        file://neard.in \
         "
 
 EXTRA_OECONF += "--enable-tools \
         "
 
-