summaryrefslogtreecommitdiffstats
path: root/meta
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
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')
-rw-r--r--meta/recipes-connectivity/neard/neard.inc10
-rw-r--r--meta/recipes-connectivity/neard/neard/parallel-build.patch40
-rw-r--r--meta/recipes-connectivity/neard/neard_0.14.bb12
-rw-r--r--meta/recipes-connectivity/neard/neard_0.15.bb9
4 files changed, 13 insertions, 58 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}/
diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch
deleted file mode 100644
index 56247495e5..0000000000
--- a/meta/recipes-connectivity/neard/neard/parallel-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Upstream-Status: Pending
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 488e898300f7a4ab9ba73307967ae9e02b7a6511 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Fri, 13 Jun 2014 17:49:45 +0100
7Subject: [PATCH] Makefile: add missing binaries to dependency on
8 local_headers
9
10seeld and snap_send were missing from the rule that generates the header symlink
11farm, resulting in headers not being available in highly parallel builds.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 Makefile.am | 9 ++++++++-
16 1 file changed, 8 insertions(+), 1 deletion(-)
17
18diff --git a/Makefile.am b/Makefile.am
19index c51351f..8e58ac1 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -254,7 +254,14 @@ se/plugin.$(OBJEXT): se/builtin.h
23 se/builtin.h: src/genbuiltin $(builtin_se_sources)
24 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_se_modules) > $@
25
26-$(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers)
27+$(src_neard_OBJECTS) \
28+$(tools_nfctool_nfctool_OBJECTS) \
29+$(plugin_objects) \
30+$(se_seeld_OBJECTS) \
31+$(unit_test_ndef_parse_OBJECTS) \
32+$(unit_test_ndef_build_OBJECTS) \
33+$(unit_test_snep_read_OBJECTS) \
34+$(tools_snep_send_OBJECTS): $(local_headers)
35
36 include/near/version.h: include/version.h
37 $(AM_V_at)$(MKDIR_P) include/near
38--
391.7.10.4
40
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb
deleted file mode 100644
index 7a1096bf4e..0000000000
--- a/meta/recipes-connectivity/neard/neard_0.14.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require neard.inc
2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
4 file://parallel-build.patch \
5 file://neard.in \
6 file://neard.service.in \
7 file://Makefile.am-fix-parallel-issue.patch \
8 "
9SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b"
10SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca"
11
12PR = "r1"
diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb
new file mode 100644
index 0000000000..c92a171301
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -0,0 +1,9 @@
1require neard.inc
2
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
4 file://neard.in \
5 file://Makefile.am-fix-parallel-issue.patch \
6 "
7SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
8SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"
9