diff options
Diffstat (limited to 'meta/recipes-connectivity/neard')
5 files changed, 54 insertions, 61 deletions
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc index e714cadc2b..4042a69b98 100644 --- a/meta/recipes-connectivity/neard/neard.inc +++ b/meta/recipes-connectivity/neard/neard.inc @@ -9,7 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -inherit autotools-brokensep pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d bluetooth + +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" @@ -21,21 +25,15 @@ do_install() { do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ - sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \ + sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ > ${D}${sysconfdir}/init.d/neard 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}/ - install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ + install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ } PACKAGES =+ "${PN}-tests" @@ -47,7 +45,7 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" # Bluez & Wifi are not mandatory except for handover RRECOMMENDS_${PN} = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ " 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 new file mode 100644 index 0000000000..16875e0543 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch @@ -0,0 +1,36 @@ +From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 12 Feb 2015 00:39:29 -0800 +Subject: [PATCH] Makefile.am: do not ship version.h + +The HEADERS' name has been changed to pkginclude_HEADERS, so use +nodist_pkginclude_HEADERS, otherwise version.h would be shipped. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3334790..69cd58f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \ + include/tlv.h include/setting.h include/device.h \ + include/nfc_copy.h include/snep.h + +-nodist_include_HEADERS = include/version.h ++nodist_pkginclude_HEADERS = include/version.h + + noinst_HEADERS = include/dbus.h + +-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \ ++local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \ + $(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/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 @@ -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 - 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 2fb47cc3d7..0000000000 --- a/meta/recipes-connectivity/neard/neard_0.14.bb +++ /dev/null @@ -1,11 +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" - 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..508c622801 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard_0.15.bb @@ -0,0 +1,10 @@ +require neard.inc + +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 \ + " +SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" +SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" + |