diff --git a/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch b/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch index d8e8a5e5da..814c5af493 100644 --- a/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch +++ b/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch @@ -1,4 +1,4 @@ -From affaa2021a54c30353e4e1fee09c13a4de2196be Mon Sep 17 00:00:00 2001 +From 57df6a3acdbe76874ca0a4d3838db9c0b25227b4 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 17 Mar 2017 14:24:29 +0200 Subject: [PATCH] Add header dependency to nciattach.o @@ -19,10 +19,10 @@ Upstream-Status: Submitted [mailinglist] 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index fa552ee..acef6ba 100644 +index d865e84..1c81d58 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -253,6 +253,7 @@ se/builtin.h: src/genbuiltin $(builtin_se_sources) +@@ -258,6 +258,7 @@ se/builtin.h: src/genbuiltin $(builtin_se_sources) $(src_neard_OBJECTS) \ $(tools_nfctool_nfctool_OBJECTS) \ @@ -30,6 +30,3 @@ index fa552ee..acef6ba 100644 $(plugin_objects) \ $(se_seeld_OBJECTS) \ $(unit_test_ndef_parse_OBJECTS) \ --- -2.11.0 - diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch index 16875e0543..1c22928def 100644 --- a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch @@ -1,4 +1,4 @@ -From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001 +From c9ea78dc914eb821d041527436ba6fa914483219 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 12 Feb 2015 00:39:29 -0800 Subject: [PATCH] Makefile.am: do not ship version.h @@ -10,11 +10,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang --- - Makefile.am | 4 ++-- + Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 3334790..69cd58f 100644 +index 592fb7c..d865e84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \ @@ -31,6 +31,3 @@ index 3334790..69cd58f 100644 $(noinst_HEADERS), include/near/$(notdir $(file))) gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \ --- -1.7.9.5 - diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch deleted file mode 100644 index aeb33a5bdc..0000000000 --- a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 43acc56d5506c7e318f717fb3634bc16e3438913 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Thu, 15 Jan 2015 18:12:07 -0800 -Subject: [PATCH] Makefile.am: fix parallel issue - -There might be no src dir if src/builtin.h runs earlier, create it to -fix the race issue: - -src/genbuiltin nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h -/bin/sh: src/builtin.h: No such file or directory - -Upstream-Status: Backport [d39f8c0eee659743b4425d395c2f7ab1949e9c71] - -Signed-off-by: Robert Yang ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -Index: neard-0.16/Makefile.am -=================================================================== ---- neard-0.16.orig/Makefile.am -+++ neard-0.16/Makefile.am -@@ -244,6 +244,7 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(di - src/plugin.$(OBJEXT): src/builtin.h - - src/builtin.h: src/genbuiltin $(builtin_sources) -+ $(AM_V_at)$(MKDIR_P) src - $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ - - se/plugin.$(OBJEXT): se/builtin.h diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.20.bb similarity index 93% rename from meta/recipes-connectivity/neard/neard_0.19.bb rename to meta/recipes-connectivity/neard/neard_0.20.bb index c1149e7631..a583da827f 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.20.bb @@ -10,12 +10,11 @@ DEPENDS = "dbus glib-2.0 libnl autoconf-archive-native" SRC_URI = "git://github.com/linux-nfc/neard;protocol=https;branch=master \ file://neard.in \ - file://Makefile.am-fix-parallel-issue.patch \ file://Makefile.am-do-not-ship-version.h.patch \ file://0001-Add-header-dependency-to-nciattach.o.patch \ - " + " -SRCREV = "a1dc8a75cba999728e154a0f811ab9dd50c809f7" +SRCREV = "7118668bc92fe15a8ff5e4067abd5e1622524f03" inherit autotools pkgconfig systemd update-rc.d