diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-connectivity/neard')
5 files changed, 0 insertions, 205 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch b/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch deleted file mode 100644 index d8e8a5e5d..000000000 --- a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch deleted file mode 100644 index 16875e054..000000000 --- a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -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/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch deleted file mode 100644 index 6e864079a..000000000 --- a/import-layers/yocto-poky/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 <liezhi.yang@windriver.com> -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: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - 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/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in b/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in deleted file mode 100644 index a47d4d96c..000000000 --- a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# start/stop neard daemon. - -### BEGIN INIT INFO -# Provides: neard -# Required-Start: $network -# Required-Stop: $network -# Default-Start: S 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: NFC daemon -# Description: neard is a daemon used to enable NFC features -### END INIT INFO - -DAEMON=@installpath@/neard -PIDFILE=/var/run/neard.pid -DESC="Linux NFC daemon" - -if [ -f /etc/default/neard ] ; then - . /etc/default/neard -fi - -set -e - -do_start() { - $DAEMON -} - -do_stop() { - start-stop-daemon --stop --name neard --quiet -} - -case "$1" in - start) - echo "Starting $DESC" - do_start - ;; - stop) - echo "Stopping $DESC" - do_stop - ;; - restart|force-reload) - echo "Restarting $DESC" - do_stop - sleep 1 - do_start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard_0.16.bb b/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard_0.16.bb deleted file mode 100644 index cc6af4e1c..000000000 --- a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard_0.16.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "Linux NFC daemon" -DESCRIPTION = "A daemon for the Linux Near Field Communication stack" -HOMEPAGE = "http://01.org/linux-nfc" -LICENSE = "GPLv2" - -DEPENDS = "dbus glib-2.0 libnl" - -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] = "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 - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" - -EXTRA_OECONF += "--enable-tools" - -# This would copy neard start-stop shell and test scripts -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 -} - -RDEPENDS_${PN} = "dbus" - -# Bluez & Wifi are not mandatory except for handover -RRECOMMENDS_${PN} = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ - " - -INITSCRIPT_NAME = "neard" -INITSCRIPT_PARAMS = "defaults 64" - -SYSTEMD_SERVICE_${PN} = "neard.service" |
