diff options
Diffstat (limited to 'meta/recipes-connectivity/neard')
| -rw-r--r-- | meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch | 15 | ||||
| -rw-r--r-- | meta/recipes-connectivity/neard/neard_0.16.bb (renamed from meta/recipes-connectivity/neard/neard_0.15.bb) | 35 |
3 files changed, 53 insertions, 32 deletions
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 new file mode 100644 index 0000000000..d8e8a5e5da --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch @@ -0,0 +1,35 @@ +From affaa2021a54c30353e4e1fee09c13a4de2196be Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Fri, 17 Mar 2017 14:24:29 +0200 +Subject: [PATCH] Add header dependency to nciattach.o + +This can happen when compiling nciattach.o: + +| In file included from ../neard-0.16/tools/nciattach.c:47:0: +| ../neard-0.16/src/near.h:30:27: fatal error: near/nfc_copy.h: No such +file or directory +| #include <near/nfc_copy.h> + +Add the missing dependency to local headers. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted [mailinglist] +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index fa552ee..acef6ba 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -253,6 +253,7 @@ se/builtin.h: src/genbuiltin $(builtin_se_sources) + + $(src_neard_OBJECTS) \ + $(tools_nfctool_nfctool_OBJECTS) \ ++$(tools_nciattach_OBJECTS) \ + $(plugin_objects) \ + $(se_seeld_OBJECTS) \ + $(unit_test_ndef_parse_OBJECTS) \ +-- +2.11.0 + 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 index 466067693d..6e864079a9 100644 --- a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch @@ -16,18 +16,15 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Makefile.am | 1 + 1 file changed, 1 insertion(+) -diff --git a/Makefile.am b/Makefile.am -index 3241311..a43eaa2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -164,6 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in \ +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) > $@ - $(src_neard_OBJECTS) \ --- -1.7.9.5 - + se/plugin.$(OBJEXT): se/builtin.h diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.16.bb index 8adf70cc9c..57f2a3e2e1 100644 --- a/meta/recipes-connectivity/neard/neard_0.15.bb +++ b/meta/recipes-connectivity/neard/neard_0.16.bb @@ -1,7 +1,7 @@ SUMMARY = "Linux NFC daemon" DESCRIPTION = "A daemon for the Linux Near Field Communication stack" HOMEPAGE = "http://01.org/linux-nfc" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" DEPENDS = "dbus glib-2.0 libnl" @@ -9,53 +9,42 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ 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 \ " -SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" -SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" +SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41" +SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -inherit autotools pkgconfig systemd update-rc.d bluetooth +inherit autotools pkgconfig systemd update-rc.d -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" EXTRA_OECONF += "--enable-tools" # This would copy neard start-stop shell and test scripts -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ > ${D}${sysconfdir}/init.d/neard chmod 0755 ${D}${sysconfdir}/init.d/neard fi - - # Install the tests for neard-tests - install -d ${D}${libdir}/neard - install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/ - install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ } -PACKAGES =+ "${PN}-tests" - -FILES_${PN}-tests = "${libdir}/${BPN}/*-test" -FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" - -RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" +RDEPENDS:${PN} = "dbus" # Bluez & Wifi are not mandatory except for handover -RRECOMMENDS_${PN} = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ +RRECOMMENDS:${PN} = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ " -RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" - INITSCRIPT_NAME = "neard" INITSCRIPT_PARAMS = "defaults 64" -SYSTEMD_SERVICE_${PN} = "neard.service" +SYSTEMD_SERVICE:${PN} = "neard.service" |