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>
This commit is contained in:
parent
4530a8f4ef
commit
3145abf078
|
@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
|
|||
|
||||
inherit autotools pkgconfig systemd update-rc.d
|
||||
|
||||
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"
|
||||
|
||||
do_install() {
|
||||
|
@ -26,12 +30,6 @@ do_install_append() {
|
|||
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}/
|
||||
|
|
|
@ -1,40 +0,0 @@
|
|||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From 488e898300f7a4ab9ba73307967ae9e02b7a6511 Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Fri, 13 Jun 2014 17:49:45 +0100
|
||||
Subject: [PATCH] Makefile: add missing binaries to dependency on
|
||||
local_headers
|
||||
|
||||
seeld and snap_send were missing from the rule that generates the header symlink
|
||||
farm, resulting in headers not being available in highly parallel builds.
|
||||
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
---
|
||||
Makefile.am | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index c51351f..8e58ac1 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -254,7 +254,14 @@ se/plugin.$(OBJEXT): se/builtin.h
|
||||
se/builtin.h: src/genbuiltin $(builtin_se_sources)
|
||||
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_se_modules) > $@
|
||||
|
||||
-$(src_neard_OBJECTS) $(tools_nfctool_nfctool_OBJECTS) $(plugin_objects): $(local_headers)
|
||||
+$(src_neard_OBJECTS) \
|
||||
+$(tools_nfctool_nfctool_OBJECTS) \
|
||||
+$(plugin_objects) \
|
||||
+$(se_seeld_OBJECTS) \
|
||||
+$(unit_test_ndef_parse_OBJECTS) \
|
||||
+$(unit_test_ndef_build_OBJECTS) \
|
||||
+$(unit_test_snep_read_OBJECTS) \
|
||||
+$(tools_snep_send_OBJECTS): $(local_headers)
|
||||
|
||||
include/near/version.h: include/version.h
|
||||
$(AM_V_at)$(MKDIR_P) include/near
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
require neard.inc
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \
|
||||
file://parallel-build.patch \
|
||||
file://neard.in \
|
||||
file://neard.service.in \
|
||||
file://Makefile.am-fix-parallel-issue.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b"
|
||||
SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca"
|
||||
|
||||
PR = "r1"
|
|
@ -0,0 +1,9 @@
|
|||
require neard.inc
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
|
||||
file://neard.in \
|
||||
file://Makefile.am-fix-parallel-issue.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
|
||||
SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"
|
||||
|
Loading…
Reference in New Issue