From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- meta/recipes-connectivity/neard/neard.inc | 59 ++++++++++++++++++++++ .../neard/Makefile.am-fix-parallel-issue.patch | 33 ++++++++++++ meta/recipes-connectivity/neard/neard/neard.in | 54 ++++++++++++++++++++ .../neard/neard/neard.service.in | 13 +++++ .../neard/neard/parallel-build.patch | 40 +++++++++++++++ meta/recipes-connectivity/neard/neard_0.14.bb | 11 ++++ 6 files changed, 210 insertions(+) create mode 100644 meta/recipes-connectivity/neard/neard.inc create mode 100644 meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch create mode 100644 meta/recipes-connectivity/neard/neard/neard.in create mode 100644 meta/recipes-connectivity/neard/neard/neard.service.in create mode 100644 meta/recipes-connectivity/neard/neard/parallel-build.patch create mode 100644 meta/recipes-connectivity/neard/neard_0.14.bb (limited to 'meta/recipes-connectivity/neard') diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc new file mode 100644 index 0000000000..e714cadc2b --- /dev/null +++ b/meta/recipes-connectivity/neard/neard.inc @@ -0,0 +1,59 @@ +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" + +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 + +EXTRA_OECONF += "--enable-tools" + +do_install() { + oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install +} + +# 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}:" ${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}/ +} + +PACKAGES =+ "${PN}-tests" + +FILES_${PN}-tests = "${libdir}/${BPN}/*-test" +FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" + +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', 'wifi','wpa-supplicant', '', d)} \ + " + +RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" + +INITSCRIPT_NAME = "neard" +INITSCRIPT_PARAMS = "defaults 64" + +SYSTEMD_SERVICE_${PN} = "neard.service" 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 new file mode 100644 index 0000000000..466067693d --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch @@ -0,0 +1,33 @@ +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: Pending + +Signed-off-by: Robert Yang +--- + 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/meta/recipes-connectivity/neard/neard/neard.in b/meta/recipes-connectivity/neard/neard/neard.in new file mode 100644 index 0000000000..a47d4d96c9 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/neard.in @@ -0,0 +1,54 @@ +#!/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/meta/recipes-connectivity/neard/neard/neard.service.in b/meta/recipes-connectivity/neard/neard/neard.service.in new file mode 100644 index 0000000000..a6f8a84180 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/neard.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=neard service +Documentation=man:neard(8) +After=syslog.target + +[Service] +Type=dbus +BusName=org.neard +ExecStart=@installpath@/neard -n + +[Install] +Alias=dbus-org.neard.service +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch new file mode 100644 index 0000000000..56247495e5 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/parallel-build.patch @@ -0,0 +1,40 @@ +Upstream-Status: Pending +Signed-off-by: Ross Burton + +From 488e898300f7a4ab9ba73307967ae9e02b7a6511 Mon Sep 17 00:00:00 2001 +From: Ross Burton +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 +--- + 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 new file mode 100644 index 0000000000..2fb47cc3d7 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard_0.14.bb @@ -0,0 +1,11 @@ +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" + -- cgit v1.2.3-54-g00ecf