summaryrefslogtreecommitdiffstats
path: root/yocto-poky/meta/recipes-connectivity/neard/neard
diff options
context:
space:
mode:
Diffstat (limited to 'yocto-poky/meta/recipes-connectivity/neard/neard')
-rw-r--r--yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch36
-rw-r--r--yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch33
-rw-r--r--yocto-poky/meta/recipes-connectivity/neard/neard/neard.in54
3 files changed, 0 insertions, 123 deletions
diff --git a/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
deleted file mode 100644
index 16875e054..000000000
--- a/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/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
deleted file mode 100644
index 466067693..000000000
--- a/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
+++ /dev/null
@@ -1,33 +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(+)
-
-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 \
- 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
-
diff --git a/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in b/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in
deleted file mode 100644
index a47d4d96c..000000000
--- a/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
OpenPOWER on IntegriCloud