summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOlivier Guiter <olivier.guiter@linux.intel.com>2013-03-12 13:33:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:04 +0000
commitef730a23e37696d72ed50c2d0e4d968abd33de7e (patch)
treef59713cc46a0924316699fd34d83049ffc6c22f7 /meta
parente609afe4d747059480b406602cab90b7c36a0572 (diff)
downloadpoky-ef730a23e37696d72ed50c2d0e4d968abd33de7e.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/neard/neard/neard.in (renamed from meta/recipes-connectivity/neard/neard/neard)14
-rw-r--r--meta/recipes-connectivity/neard/neard_0.9.bb32
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 @@
1#!/bin/sh 1#!/bin/sh
2#
3# start/stop neard daemon.
2 4
3DAEMON=/usr/sbin/neard 5### BEGIN INIT INFO
6# Provides: neard
7# Required-Start: $network
8# Required-Stop: $network
9# Default-Start: S 2 3 4 5
10# Default-Stop: 0 1 6
11# Short-Description: NFC daemon
12# Description: neard is a daemon used to enable NFC features
13### END INIT INFO
14
15DAEMON=@installpath@/neard
4PIDFILE=/var/run/neard.pid 16PIDFILE=/var/run/neard.pid
5DESC="Linux NFC daemon" 17DESC="Linux NFC daemon"
6 18
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
11INITSCRIPT_NAME = "neard" 11INITSCRIPT_NAME = "neard"
12INITSCRIPT_PARAMS = "defaults 64" 12INITSCRIPT_PARAMS = "defaults 64"
13 13
14do_install() {
15 oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
16}
17
14# This would copy neard start-stop shell and test scripts 18# This would copy neard start-stop shell and test scripts
15do_install_append() { 19do_install_append() {
16 install -d ${D}${sysconfdir}/init.d/ 20 # start/stop
17 install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard 21 install -d ${D}${sysconfdir}/init.d/
22
23 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
24 > ${D}${sysconfdir}/init.d/neard
25
26 chmod 0755 ${D}${sysconfdir}/init.d/neard
18 27
19 install -d ${D}${libdir}/neard 28 #test files
20 install -m 0755 ${S}/test/* ${D}${libdir}/neard/ 29 install -d ${D}${libdir}/neard
21 install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/ 30 install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
31 install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
22} 32}
23 33
24RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" 34RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
@@ -32,26 +42,24 @@ RRECOMMENDS_${PN} = "\
32#Additional 42#Additional
33PACKAGES =+ "${PN}-tests" 43PACKAGES =+ "${PN}-tests"
34 44
35FILES_${PN}-tests = "${libdir}/neard/*-test" 45FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
36RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" 46FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
37 47
38FILES_${PN}-dbg += "${bindir}/neard/*/.debug" 48RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
39 49
40##=============================
41# This is valid for 0.9+ 50# This is valid for 0.9+
42LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 51LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
43 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ 52 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
44 " 53 "
45S = "${WORKDIR}/git" 54S = "${WORKDIR}/git"
46SRCREV = "7abdb13d106d496e1115fab49e6448a249dfb3c8" 55SRCREV = "1e20e396cb837017b7e5ef822bfdab6ce060d2cf"
47PV = "0.9-git${SRCPV}" 56PV = "0.9-git${SRCPV}"
48PR = "r1" 57PR = "r1"
49 58
50SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \ 59SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \
51 file://neard \ 60 file://neard.in \
52 " 61 "
53 62
54EXTRA_OECONF += "--enable-tools \ 63EXTRA_OECONF += "--enable-tools \
55 " 64 "
56 65
57