summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-17 00:34:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-20 10:40:41 +0100
commit7942e645b382695d74043c57838051c88e52ed4a (patch)
treec47634caf7603e093d311214fc53c229b65b9b6b
parenta2d67457cb7122e334214614bb43396acab7f273 (diff)
downloadpoky-7942e645b382695d74043c57838051c88e52ed4a.tar.gz
neard: merge .inc file
The .inc file contains so much version-dependent logic (for example behaviour of libexecdir and location of installed daemon) that there's not really any point in having the two split. (From OE-Core rev: 40ffba7a7f0f32f0c8073a457a393891a31f8555) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/neard/neard.inc53
-rw-r--r--meta/recipes-connectivity/neard/neard_0.15.bb53
2 files changed, 52 insertions, 54 deletions
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
deleted file mode 100644
index 6ab185c51f..0000000000
--- a/meta/recipes-connectivity/neard/neard.inc
+++ /dev/null
@@ -1,53 +0,0 @@
1SUMMARY = "Linux NFC daemon"
2DESCRIPTION = "A daemon for the Linux Near Field Communication stack"
3HOMEPAGE = "http://01.org/linux-nfc"
4LICENSE = "GPLv2"
5
6DEPENDS = "dbus glib-2.0 libnl"
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
9 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
10 "
11
12inherit autotools pkgconfig systemd update-rc.d bluetooth
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
18EXTRA_OECONF += "--enable-tools"
19
20# This would copy neard start-stop shell and test scripts
21do_install_append() {
22 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
23 install -d ${D}${sysconfdir}/init.d/
24 sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \
25 > ${D}${sysconfdir}/init.d/neard
26 chmod 0755 ${D}${sysconfdir}/init.d/neard
27 fi
28
29 # Install the tests for neard-tests
30 install -d ${D}${libdir}/neard
31 install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
32 install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
33}
34
35PACKAGES =+ "${PN}-tests"
36
37FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
38FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
39
40RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
41
42# Bluez & Wifi are not mandatory except for handover
43RRECOMMENDS_${PN} = "\
44 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
46 "
47
48RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
49
50INITSCRIPT_NAME = "neard"
51INITSCRIPT_PARAMS = "defaults 64"
52
53SYSTEMD_SERVICE_${PN} = "neard.service"
diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb
index 508c622801..8adf70cc9c 100644
--- a/meta/recipes-connectivity/neard/neard_0.15.bb
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -1,4 +1,9 @@
1require neard.inc 1SUMMARY = "Linux NFC daemon"
2DESCRIPTION = "A daemon for the Linux Near Field Communication stack"
3HOMEPAGE = "http://01.org/linux-nfc"
4LICENSE = "GPLv2"
5
6DEPENDS = "dbus glib-2.0 libnl"
2 7
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ 8SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
4 file://neard.in \ 9 file://neard.in \
@@ -8,3 +13,49 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
8SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" 13SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
9SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" 14SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"
10 15
16LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
17 file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \
18 "
19
20inherit autotools pkgconfig systemd update-rc.d bluetooth
21
22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
23
24PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd"
25
26EXTRA_OECONF += "--enable-tools"
27
28# This would copy neard start-stop shell and test scripts
29do_install_append() {
30 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
31 install -d ${D}${sysconfdir}/init.d/
32 sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \
33 > ${D}${sysconfdir}/init.d/neard
34 chmod 0755 ${D}${sysconfdir}/init.d/neard
35 fi
36
37 # Install the tests for neard-tests
38 install -d ${D}${libdir}/neard
39 install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/
40 install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/
41}
42
43PACKAGES =+ "${PN}-tests"
44
45FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
46FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
47
48RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
49
50# Bluez & Wifi are not mandatory except for handover
51RRECOMMENDS_${PN} = "\
52 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
53 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
54 "
55
56RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
57
58INITSCRIPT_NAME = "neard"
59INITSCRIPT_PARAMS = "defaults 64"
60
61SYSTEMD_SERVICE_${PN} = "neard.service"