Commit Graph

31 Commits

Author SHA1 Message Date
Jussi Kukkonen a1eb378771 neard: Fix parallel build issue
This only started showing up now for some reason but it does seem like
a legitimate bug in Makefile.am.

(From OE-Core rev: f43290f6e302dbacf5581d1fe1c6c991dd387779)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-21 22:39:17 +00:00
Peter Kjellerstedt 254bfb1071 recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-01 11:17:45 +00:00
Maxin B. John 9045e21b7f neard: upgrade to 0.16
0.15 -> 0.16

(From OE-Core rev: a6c88ff6c22a832762d3357967e885064feb577b)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-20 10:28:44 +01:00
Alexander Kanavin 48bd640780 neard: do not package python test scripts
They require python-dbus and python-gobject
(which are only provided for Python 3), and have not
been ported to Python 3.

(From OE-Core rev: 6334de28bfd5252343deef326e4edca785254b85)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03 13:13:26 +01:00
Ross Burton 455ff32426 meta: more removals of redunant FILES_${PN}-dbg
In some recipes overly-split -dbg packages were merged into PN-dbg.  Unless
there's a very good reason, recipes should have a single -dev and -dbg package.

(From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-16 11:56:30 +00:00
Ross Burton b82221674e neard: fix libdir/libexecdir confusion
These binaries are installed to $libexecdir/nfc not $libdir/$BPN.

(From OE-Core rev: 32da30e39b3b847a80d99e1d2a527f460e33590d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:50 +00:00
Ross Burton 7942e645b3 neard: merge .inc file
The .inc file contains so much version-dependent logic (for example behaviour of
libexecdir and location of installed daemon) that there's not really any point
in having the two split.

(From OE-Core rev: 40ffba7a7f0f32f0c8073a457a393891a31f8555)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-20 10:40:41 +01:00
Ross Burton a2d67457cb neard: remove overridden do_install
Overriding libexecdir was required when neard did funky things in the Makefile,
but it doesn't anymore.

(From OE-Core rev: a01b29fdcf37c5231846265b97ee599e8321cdee)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-20 10:40:41 +01:00
Ross Burton dcb441c6e0 neard: remove unused service file
Upstream ships a systemd service file now, so we don't need this anymore.

(From OE-Core rev: 9a685d60b0549626cccea5fea8f22a57c2306f81)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-23 11:47:40 +01:00
Cristian Iorga b4578680f6 neard: fix the install path in init scripts
The neard make scripts will place the daemon executable
in /usr/lib/neard/nfc/neard. Change the path accordingly
in init scripts.

Fixes [YOCTO #7390].

(From OE-Core rev: bd277f3a46e7fc764cc55c5354d2136fcfddc3c1)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-22 14:42:14 +00:00
Peter A. Bigot 47dea14069 neard: select distro preference for bluez provider
(From OE-Core rev: 33b3164c2627d20315ff716e7d78ced86871c472)

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-17 13:43:39 +00:00
Robert Yang f404ab2563 neard: 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.

It would cause other pkgs failed to build if ship version.h to
usr/include/version.h

(From OE-Core rev: 2025284acf8999d254c671b5e259587a4171858f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-15 21:58:26 +00:00
Cristian Iorga 3145abf078 neard: upgrade to 0.15
- parallel-build.patch patch removed,
included upstream;
- systemd unit files provided by neard,
YP-provided removed;
- improved systemd support.

(From OE-Core rev: a86985f890bef6a22e57f754e184ac8f5c59ce9c)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-02-08 08:00:29 +00:00
Robert Yang e22020741a neard: fix B != S
And bump PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

(From OE-Core rev: 26937169a0cb04e71ddd79bae3bca6feb22fc369)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-23 11:36:28 +00:00
Robert Yang 7cd72306bf neard: fix parallel issue
There might be no src dir if the 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

(From OE-Core rev: 4b6762b924a561febede13b85330309dbf75da19)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-23 11:36:28 +00:00
Ross Burton 18b42b8718 neard: update service file
Update the service file to more closely match the service file that has been
committed upstream.

In particular we don't want to restart neard on failure (this results in it
restarting repeatedly if no NFC hardware is found), redirecting stdout to
/dev/null means that any messages are lost instead of being sent to the journal,
and the DBus alias is required for bus activation to work correctly.

(From OE-Core rev: b6afd8e5abcd412c17e14c59379b9583b95fd517)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-10-10 16:44:32 +01:00
Richard Purdie 33636381aa neard: Fix typo in patch leading to parallel make race
The typo left room for a parallel make race for unit/test-snep-read.o,
fix it.

(From OE-Core rev: 061b9fd4b6dca030df1f2f00a59ad7d365b06894)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-17 12:28:50 +01:00
Ross Burton 5cc9702026 neard: fix more parallel build issues
One fix, another appears...  root-cause to a magic dependency hiding at the
bottom of the Makefile, and add all binaries to it.

[ YOCTO #6416 ]

(From OE-Core rev: 4625eb0793ff59e4414017df0371ee9b89f47b38)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-14 08:43:56 +01:00
Richard Purdie 7c0aa8fd80 neard: fix for parallel build
for neard tools/snep-send object might cause a
parallel build failure,due to undetected
dependency on dbus.h header file.

Patch will be submitted upstream.

Fixes [YOCTO #6389].

(From OE-Core rev: ae55abd60ef217ad1a957102d80b06857ea8ebcd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-06 09:26:05 +01:00
Otavio Salvador 4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01:00
Richard Purdie 069de520ec autotools-brokensep: Mark recipes with broken separate build dir support
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.

This doesn't introduce any change in behaviour in its own right.

(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:16 +00:00
Cristian Iorga 6a7a21062b neard: upgrade to 0.14
switched from git version to tarball,
as new releases are now versioned.

(From OE-Core rev: 0624d1a54ca6490a3c118192603fe68423e054b4)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-28 00:52:33 +00:00
Richard Purdie 5e42796675 recipes: Remove PR = r0 from all recipes
Remove all PR = "r0" from all .bb files in oe-core. This was done
with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i

We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).

(From OE-Core rev: 58ae94f1b06d0e6234413dbf9869bde85f154c85)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-30 14:52:04 +00:00
Jackie Huang 88c5e10d62 remove the unnecessary protocol parameters
It's not necessary to specify the protocol parameter when it's the
default protocol for the fetcher, e.g. the default protocol for
git fetcher it git, "protocol=git" isn't needed.

(From OE-Core rev: a2bab241c64428d5109c3c5ac5de4463fbad70c5)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-30 16:23:46 +01:00
Jukka Rissanen 468c6f82df neard: Split recipe to two parts
This way it is easier to override settings if needed.

(From OE-Core rev: 453b96314076c2407dd56d8dc5613dc02a622e73)

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-12 09:37:28 +01:00
Jukka Rissanen ec587c5e4f neard: Rename the recipe as we are already in 0.10
(From OE-Core rev: 0f26f430d2bcca37eea63740dae51ac1e49bc550)

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-03 16:35:20 +01:00
Ross Burton c42cc8fb38 neard: add systemd unit file
Add a systemd unit file, and respect the sysvinit feature when installing the
init script.

(thanks to Jukka Rissanen for the unit file)

(From OE-Core rev: e86538db13605953465aacc3f2fb7d719dad919e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-29 15:31:41 +01:00
Ross Burton 354287932e neard: re-order recipe so the statement order is logical
(From OE-Core rev: 373dc2778f263baa7958c48cc1644008e2a40676)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-29 14:47:46 +01:00
Olivier Guiter 3c0deeb41e neard: upgrade to 0.10
neard ver 0.10:
	Added initial WiFi handover support.
	Added Service Name Lookup support to nfctool.
	Added NDEF building unit tests.
	Added State support to Bluetooth handover agent.
	Added neard and neard.conf man pages.
	Added a copy of the NFC kernel header.
	Fixed handover validation tests failures.
	Fixed Tag and Device PropertyChanged signal.

(From OE-Core rev: dff13ee38a4f6aa51722149b860a2af354d6f9e8)

Signed-off-by: Olivier Guiter <olivier.guiter@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-18 21:42:24 +00:00
Olivier Guiter ef730a23e3 neard: Update reference commit sha1 and install script
This patch installs neard daemon in /usr/lib/neard.

(From OE-Core rev: 415e5bb60bfffe1f3b2acbb3136a45f63bfa91b9)

Signed-off-by: Olivier Guiter <olivier.guiter@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-15 01:53:04 +00:00
Olivier Guiter d5cfb00f08 Near Field communication recipe for neard 0.9
The Linux NFC project aims to provide a full NFC support for Linux.
It is based on the neard NFC user space stack running on top of the
Linux kernel NFC subsystem.
The code generated using this recipe was tested on a ARM11 device, with
a kernel 3.6, using, for the NFC hardware, a USB dongle with the PN533
chipset (SCL3711)

(From OE-Core rev: b2a74ae70725be7efc0226901fd560d3b3b48607)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-07 11:14:38 +00:00