* [Buildroot] [pull request] Pull request for branch misc-fixes
@ 2012-12-09 18:13 Thomas Petazzoni
2012-12-09 18:13 ` [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms Thomas Petazzoni
` (7 more replies)
0 siblings, 8 replies; 18+ messages in thread
From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw)
To: buildroot
Hello,
A bunch of build failure fixes, especially one for the neard
<linux/nfc.h> problem, which is causing most of the autobuilders
failure noise at the moment.
Thanks.
Thomas
The following changes since commit 054f97e1f2de337ea0c788d766212a36d6d4e41c:
pkg-infra: add <pkg>-extract and <pkg>-patch targets to OVERRIDE support (2012-12-06 17:13:57 -0800)
are available in the git repository at:
git://git.free-electrons.com/users/thomas-petazzoni/buildroot.git misc-fixes
for you to fetch changes up to 998c031cc673d7c76c7d9bd8c4402fa928ed803e:
libev: disable on avr32 (2012-12-09 18:44:40 +0100)
----------------------------------------------------------------
Thomas Petazzoni (8):
ccache: uses fork(), there only usable on MMU platforms
ccache: deprecate the target package
rt-tests: requires thread support in the toolchain
rt-tests: not available on avr32, too old uClibc
bmon: needs MMU for fork()
xapp_xmh: add dependency on xdata_xbitmap
neard: fix build failure caused by missing <linux/nfc.h>
libev: disable on avr32
package/bmon/Config.in | 2 +
package/ccache/Config.in | 4 +
package/libev/Config.in | 2 +
.../neard/neard-fix-missing-linux-nfc-header.patch | 387 ++++++++++++++++++++
package/neard/neard.mk | 1 +
package/rt-tests/Config.in | 4 +
package/x11r7/xapp_xmh/Config.in | 1 +
package/x11r7/xapp_xmh/xapp_xmh.mk | 2 +-
8 files changed, 402 insertions(+), 1 deletion(-)
create mode 100644 package/neard/neard-fix-missing-linux-nfc-header.patch
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 18+ messages in thread* [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni @ 2012-12-09 18:13 ` Thomas Petazzoni 2012-12-09 20:50 ` Peter Korsgaard 2012-12-09 18:13 ` [Buildroot] [PATCH 2/8] ccache: deprecate the target package Thomas Petazzoni ` (6 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw) To: buildroot Fixes: http://autobuild.buildroot.org/results/2ba0eb693d24ac4ed9979762db234bfff1952c69/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/ccache/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ccache/Config.in b/package/ccache/Config.in index 4a37973..30e6578 100644 --- a/package/ccache/Config.in +++ b/package/ccache/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_CCACHE bool "ccache" + # needs fork() + depends on BR2_USE_MMU help ccache is a compiler cache. It speeds up recompilation by caching previous compilations and detecting when the same -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms 2012-12-09 18:13 ` [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms Thomas Petazzoni @ 2012-12-09 20:50 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:50 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Fixes: Thomas> http://autobuild.buildroot.org/results/2ba0eb693d24ac4ed9979762db234bfff1952c69/build-end.log Committed with commit message changed with s/there/therefore/, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 2/8] ccache: deprecate the target package 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni 2012-12-09 18:13 ` [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms Thomas Petazzoni @ 2012-12-09 18:13 ` Thomas Petazzoni 2012-12-09 20:51 ` Peter Korsgaard 2012-12-09 18:13 ` [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain Thomas Petazzoni ` (5 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw) To: buildroot Since we have deprecated the capability of building a toolchain for the target, it makes sense to also deprecate ccache for the target. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/ccache/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ccache/Config.in b/package/ccache/Config.in index 30e6578..41ace52 100644 --- a/package/ccache/Config.in +++ b/package/ccache/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_CCACHE bool "ccache" # needs fork() depends on BR2_USE_MMU + # We no longer support a toolchain on the target + depends on BR2_DEPRECATED help ccache is a compiler cache. It speeds up recompilation by caching previous compilations and detecting when the same -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 2/8] ccache: deprecate the target package 2012-12-09 18:13 ` [Buildroot] [PATCH 2/8] ccache: deprecate the target package Thomas Petazzoni @ 2012-12-09 20:51 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:51 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Since we have deprecated the capability of building a toolchain for Thomas> the target, it makes sense to also deprecate ccache for the target. Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni 2012-12-09 18:13 ` [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms Thomas Petazzoni 2012-12-09 18:13 ` [Buildroot] [PATCH 2/8] ccache: deprecate the target package Thomas Petazzoni @ 2012-12-09 18:13 ` Thomas Petazzoni 2012-12-09 20:53 ` Peter Korsgaard 2012-12-09 18:13 ` [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc Thomas Petazzoni ` (4 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw) To: buildroot The rt-tests package extensively use threads, so this package should only be available if the toolchain has thread support. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/rt-tests/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index e645266..337c020 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" + depends on BR2_TOOLCHAIN_HAS_THREADS help Set of utilities for testing the real-time behaviour of a Linux system. -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain 2012-12-09 18:13 ` [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain Thomas Petazzoni @ 2012-12-09 20:53 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:53 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> The rt-tests package extensively use threads, so this package should Thomas> only be available if the toolchain has thread support. Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Thomas> --- Thomas> package/rt-tests/Config.in | 1 + Thomas> 1 file changed, 1 insertion(+) Thomas> diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in Thomas> index e645266..337c020 100644 Thomas> --- a/package/rt-tests/Config.in Thomas> +++ b/package/rt-tests/Config.in Thomas> @@ -1,5 +1,6 @@ Thomas> config BR2_PACKAGE_RT_TESTS Thomas> bool "rt-tests" Thomas> + depends on BR2_TOOLCHAIN_HAS_THREADS You forgot to add a comment when not available. I've added that and committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni ` (2 preceding siblings ...) 2012-12-09 18:13 ` [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain Thomas Petazzoni @ 2012-12-09 18:13 ` Thomas Petazzoni 2012-12-09 20:56 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() Thomas Petazzoni ` (3 subsequent siblings) 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw) To: buildroot The old uClibc used for the AVR32 architecture does not implement priority inheritance, therefore rt-tests cannot build. Fixes: http://autobuild.buildroot.org/results/695293d889128c666174d5fe03c5deadbe4d5415/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/rt-tests/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index 337c020..54cb8d0 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" depends on BR2_TOOLCHAIN_HAS_THREADS + # Too old uClibc, does not provide priority-inheritance + # mutexes + depends on !BR2_avr32 help Set of utilities for testing the real-time behaviour of a Linux system. -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc 2012-12-09 18:13 ` [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc Thomas Petazzoni @ 2012-12-09 20:56 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:56 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> The old uClibc used for the AVR32 architecture does not implement Thomas> priority inheritance, therefore rt-tests cannot build. Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni ` (3 preceding siblings ...) 2012-12-09 18:13 ` [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc Thomas Petazzoni @ 2012-12-09 18:14 ` Thomas Petazzoni 2012-12-09 18:20 ` Thomas Petazzoni 2012-12-09 20:56 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap Thomas Petazzoni ` (2 subsequent siblings) 7 siblings, 2 replies; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw) To: buildroot Fixes: http://autobuild.buildroot.org/results/673b0e9a1ba75123ba2c59df8ad81550170fffef/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/bmon/Config.in | 2 ++ package/rt-tests/Config.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/bmon/Config.in b/package/bmon/Config.in index 9692118..652fd9e 100644 --- a/package/bmon/Config.in +++ b/package/bmon/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_BMON bool "bmon" depends on BR2_INET_IPV6 + # needs fork() + depends on BR2_USE_MMU help Linux bandwidth monitor diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index 54cb8d0..1a0592f 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" depends on BR2_TOOLCHAIN_HAS_THREADS - # Too old uClibc, does not provide priority-inheritance - # mutexes + # Too old uClibc on AVR32, does not provide + # priority-inheritance mutexes depends on !BR2_avr32 help Set of utilities for testing the real-time behaviour of a -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() 2012-12-09 18:14 ` [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() Thomas Petazzoni @ 2012-12-09 18:20 ` Thomas Petazzoni 2012-12-09 20:56 ` Peter Korsgaard 1 sibling, 0 replies; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:20 UTC (permalink / raw) To: buildroot On Sun, 9 Dec 2012 19:14:00 +0100, Thomas Petazzoni wrote: > diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in > index 54cb8d0..1a0592f 100644 > --- a/package/rt-tests/Config.in > +++ b/package/rt-tests/Config.in > @@ -1,8 +1,8 @@ > config BR2_PACKAGE_RT_TESTS > bool "rt-tests" > depends on BR2_TOOLCHAIN_HAS_THREADS > - # Too old uClibc, does not provide priority-inheritance > - # mutexes > + # Too old uClibc on AVR32, does not provide > + # priority-inheritance mutexes > depends on !BR2_avr32 > help > Set of utilities for testing the real-time behaviour of a FWIW, I've pushed at the same location a new version of this branch that removes this incorrect part (and squashed it properly in the previous commit). Sorry for the mess. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() 2012-12-09 18:14 ` [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() Thomas Petazzoni 2012-12-09 18:20 ` Thomas Petazzoni @ 2012-12-09 20:56 ` Peter Korsgaard 1 sibling, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:56 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Fixes: Thomas> http://autobuild.buildroot.org/results/673b0e9a1ba75123ba2c59df8ad81550170fffef/build-end.log Gustavo already sent a similar patch for this, so I dropped this one. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni ` (4 preceding siblings ...) 2012-12-09 18:14 ` [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() Thomas Petazzoni @ 2012-12-09 18:14 ` Thomas Petazzoni 2012-12-09 20:57 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h> Thomas Petazzoni 2012-12-09 18:14 ` [Buildroot] [PATCH 8/8] libev: disable on avr32 Thomas Petazzoni 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw) To: buildroot Fixes: http://autobuild.buildroot.org/results/fa059a89a305914700f63d7f0b0d4a3f63beb039/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/x11r7/xapp_xmh/Config.in | 1 + package/x11r7/xapp_xmh/xapp_xmh.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xmh/Config.in b/package/x11r7/xapp_xmh/Config.in index 3da965a..1ef65c7 100644 --- a/package/x11r7/xapp_xmh/Config.in +++ b/package/x11r7/xapp_xmh/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XAPP_XMH bool "xmh" select BR2_PACKAGE_XLIB_LIBXAW + select BR2_PACKAGE_XDATA_XBITMAPS help send and read mail with an X interface to MH diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk index 934f38d..920289e 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.mk +++ b/package/x11r7/xapp_xmh/xapp_xmh.mk @@ -7,6 +7,6 @@ XAPP_XMH_VERSION = 1.0.2 XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2 XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMH_DEPENDENCIES = xlib_libXaw +XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps $(eval $(autotools-package)) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap 2012-12-09 18:14 ` [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap Thomas Petazzoni @ 2012-12-09 20:57 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:57 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Fixes: Thomas> http://autobuild.buildroot.org/results/fa059a89a305914700f63d7f0b0d4a3f63beb039/build-end.log Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h> 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni ` (5 preceding siblings ...) 2012-12-09 18:14 ` [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap Thomas Petazzoni @ 2012-12-09 18:14 ` Thomas Petazzoni 2012-12-09 20:58 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 8/8] libev: disable on avr32 Thomas Petazzoni 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw) To: buildroot Fixes: http://autobuild.buildroot.org/results/bd1cb8795415b7369a9f4268b9f058cb78d4000d/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- .../neard/neard-fix-missing-linux-nfc-header.patch | 387 ++++++++++++++++++++ package/neard/neard.mk | 1 + 2 files changed, 388 insertions(+) create mode 100644 package/neard/neard-fix-missing-linux-nfc-header.patch diff --git a/package/neard/neard-fix-missing-linux-nfc-header.patch b/package/neard/neard-fix-missing-linux-nfc-header.patch new file mode 100644 index 0000000..9b9ce32 --- /dev/null +++ b/package/neard/neard-fix-missing-linux-nfc-header.patch @@ -0,0 +1,387 @@ +Add a private copy of <linux/nfc.h> + +The addition of the <linux/nfc.h> header in the kernel sources is +moderately recent, and therefore, a number of toolchains don't have +this header. + +As a workaround until all reasonable toolchains get this header +included, add a configure check in neard to test whether this header +is available or not, and if not, use our own private copy of it. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: neard-0.8/configure.ac +=================================================================== +--- neard-0.8.orig/configure.ac 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/configure.ac 2012-12-09 17:08:00.000000000 +0100 +@@ -88,6 +88,8 @@ + AC_SUBST(NETLINK_CFLAGS) + AC_SUBST(NETLINK_LIBS) + ++AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>]) ++ + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], + [enable test/example scripts]), + [enable_test=${enableval}]) +Index: neard-0.8/src/near.h +=================================================================== +--- neard-0.8.orig/src/near.h 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/src/near.h 2012-12-09 16:56:40.000000000 +0100 +@@ -23,7 +23,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "linux-nfc.h" ++#endif + + #include <glib.h> + +Index: neard-0.8/src/linux-nfc.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ neard-0.8/src/linux-nfc.h 2012-12-09 17:11:10.000000000 +0100 +@@ -0,0 +1,197 @@ ++/* ++ * Copyright (C) 2011 Instituto Nokia de Tecnologia ++ * ++ * Authors: ++ * Lauro Ramos Venancio <lauro.venancio@openbossa.org> ++ * Aloisio Almeida Jr <aloisio.almeida@openbossa.org> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the ++ * Free Software Foundation, Inc., ++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++#ifndef __LINUX_NFC_H ++#define __LINUX_NFC_H ++ ++#include <linux/types.h> ++#include <linux/socket.h> ++ ++#define NFC_GENL_NAME "nfc" ++#define NFC_GENL_VERSION 1 ++ ++#define NFC_GENL_MCAST_EVENT_NAME "events" ++ ++/** ++ * enum nfc_commands - supported nfc commands ++ * ++ * @NFC_CMD_UNSPEC: unspecified command ++ * ++ * @NFC_CMD_GET_DEVICE: request information about a device (requires ++ * %NFC_ATTR_DEVICE_INDEX) or dump request to get a list of all nfc devices ++ * @NFC_CMD_DEV_UP: turn on the nfc device ++ * (requires %NFC_ATTR_DEVICE_INDEX) ++ * @NFC_CMD_DEV_DOWN: turn off the nfc device ++ * (requires %NFC_ATTR_DEVICE_INDEX) ++ * @NFC_CMD_START_POLL: start polling for targets using the given protocols ++ * (requires %NFC_ATTR_DEVICE_INDEX and %NFC_ATTR_PROTOCOLS) ++ * @NFC_CMD_STOP_POLL: stop polling for targets (requires ++ * %NFC_ATTR_DEVICE_INDEX) ++ * @NFC_CMD_GET_TARGET: dump all targets found by the previous poll (requires ++ * %NFC_ATTR_DEVICE_INDEX) ++ * @NFC_EVENT_TARGETS_FOUND: event emitted when a new target is found ++ * (it sends %NFC_ATTR_DEVICE_INDEX) ++ * @NFC_EVENT_DEVICE_ADDED: event emitted when a new device is registred ++ * (it sends %NFC_ATTR_DEVICE_NAME, %NFC_ATTR_DEVICE_INDEX and ++ * %NFC_ATTR_PROTOCOLS) ++ * @NFC_EVENT_DEVICE_REMOVED: event emitted when a device is removed ++ * (it sends %NFC_ATTR_DEVICE_INDEX) ++ * @NFC_EVENT_TM_ACTIVATED: event emitted when the adapter is activated in ++ * target mode. ++ * @NFC_EVENT_DEVICE_DEACTIVATED: event emitted when the adapter is deactivated ++ * from target mode. ++ */ ++enum nfc_commands { ++ NFC_CMD_UNSPEC, ++ NFC_CMD_GET_DEVICE, ++ NFC_CMD_DEV_UP, ++ NFC_CMD_DEV_DOWN, ++ NFC_CMD_DEP_LINK_UP, ++ NFC_CMD_DEP_LINK_DOWN, ++ NFC_CMD_START_POLL, ++ NFC_CMD_STOP_POLL, ++ NFC_CMD_GET_TARGET, ++ NFC_EVENT_TARGETS_FOUND, ++ NFC_EVENT_DEVICE_ADDED, ++ NFC_EVENT_DEVICE_REMOVED, ++ NFC_EVENT_TARGET_LOST, ++ NFC_EVENT_TM_ACTIVATED, ++ NFC_EVENT_TM_DEACTIVATED, ++/* private: internal use only */ ++ __NFC_CMD_AFTER_LAST ++}; ++#define NFC_CMD_MAX (__NFC_CMD_AFTER_LAST - 1) ++ ++/** ++ * enum nfc_attrs - supported nfc attributes ++ * ++ * @NFC_ATTR_UNSPEC: unspecified attribute ++ * ++ * @NFC_ATTR_DEVICE_INDEX: index of nfc device ++ * @NFC_ATTR_DEVICE_NAME: device name, max 8 chars ++ * @NFC_ATTR_PROTOCOLS: nfc protocols - bitwise or-ed combination from ++ * NFC_PROTO_*_MASK constants ++ * @NFC_ATTR_TARGET_INDEX: index of the nfc target ++ * @NFC_ATTR_TARGET_SENS_RES: NFC-A targets extra information such as NFCID ++ * @NFC_ATTR_TARGET_SEL_RES: NFC-A targets extra information (useful if the ++ * target is not NFC-Forum compliant) ++ * @NFC_ATTR_TARGET_NFCID1: NFC-A targets identifier, max 10 bytes ++ * @NFC_ATTR_TARGET_SENSB_RES: NFC-B targets extra information, max 12 bytes ++ * @NFC_ATTR_TARGET_SENSF_RES: NFC-F targets extra information, max 18 bytes ++ * @NFC_ATTR_COMM_MODE: Passive or active mode ++ * @NFC_ATTR_RF_MODE: Initiator or target ++ * @NFC_ATTR_IM_PROTOCOLS: Initiator mode protocols to poll for ++ * @NFC_ATTR_TM_PROTOCOLS: Target mode protocols to listen for ++ */ ++enum nfc_attrs { ++ NFC_ATTR_UNSPEC, ++ NFC_ATTR_DEVICE_INDEX, ++ NFC_ATTR_DEVICE_NAME, ++ NFC_ATTR_PROTOCOLS, ++ NFC_ATTR_TARGET_INDEX, ++ NFC_ATTR_TARGET_SENS_RES, ++ NFC_ATTR_TARGET_SEL_RES, ++ NFC_ATTR_TARGET_NFCID1, ++ NFC_ATTR_TARGET_SENSB_RES, ++ NFC_ATTR_TARGET_SENSF_RES, ++ NFC_ATTR_COMM_MODE, ++ NFC_ATTR_RF_MODE, ++ NFC_ATTR_DEVICE_POWERED, ++ NFC_ATTR_IM_PROTOCOLS, ++ NFC_ATTR_TM_PROTOCOLS, ++/* private: internal use only */ ++ __NFC_ATTR_AFTER_LAST ++}; ++#define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1) ++ ++#define NFC_DEVICE_NAME_MAXSIZE 8 ++#define NFC_NFCID1_MAXSIZE 10 ++#define NFC_SENSB_RES_MAXSIZE 12 ++#define NFC_SENSF_RES_MAXSIZE 18 ++#define NFC_GB_MAXSIZE 48 ++ ++/* NFC protocols */ ++#define NFC_PROTO_JEWEL 1 ++#define NFC_PROTO_MIFARE 2 ++#define NFC_PROTO_FELICA 3 ++#define NFC_PROTO_ISO14443 4 ++#define NFC_PROTO_NFC_DEP 5 ++#define NFC_PROTO_ISO14443_B 6 ++ ++#define NFC_PROTO_MAX 7 ++ ++/* NFC communication modes */ ++#define NFC_COMM_ACTIVE 0 ++#define NFC_COMM_PASSIVE 1 ++ ++/* NFC RF modes */ ++#define NFC_RF_INITIATOR 0 ++#define NFC_RF_TARGET 1 ++#define NFC_RF_NONE 2 ++ ++/* NFC protocols masks used in bitsets */ ++#define NFC_PROTO_JEWEL_MASK (1 << NFC_PROTO_JEWEL) ++#define NFC_PROTO_MIFARE_MASK (1 << NFC_PROTO_MIFARE) ++#define NFC_PROTO_FELICA_MASK (1 << NFC_PROTO_FELICA) ++#define NFC_PROTO_ISO14443_MASK (1 << NFC_PROTO_ISO14443) ++#define NFC_PROTO_NFC_DEP_MASK (1 << NFC_PROTO_NFC_DEP) ++#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B) ++ ++struct sockaddr_nfc { ++ sa_family_t sa_family; ++ __u32 dev_idx; ++ __u32 target_idx; ++ __u32 nfc_protocol; ++}; ++ ++#define NFC_LLCP_MAX_SERVICE_NAME 63 ++struct sockaddr_nfc_llcp { ++ sa_family_t sa_family; ++ __u32 dev_idx; ++ __u32 target_idx; ++ __u32 nfc_protocol; ++ __u8 dsap; /* Destination SAP, if known */ ++ __u8 ssap; /* Source SAP to be bound to */ ++ char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */; ++ size_t service_name_len; ++}; ++ ++/* NFC socket protocols */ ++#define NFC_SOCKPROTO_RAW 0 ++#define NFC_SOCKPROTO_LLCP 1 ++#define NFC_SOCKPROTO_MAX 2 ++ ++#define NFC_HEADER_SIZE 1 ++ ++/** ++ * Pseudo-header info for raw socket packets ++ * First byte is the adapter index ++ * Second byte contains flags ++ * - 0x01 - Direction (0=RX, 1=TX) ++ * - 0x02-0x80 - Reserved ++ **/ ++#define NFC_LLCP_RAW_HEADER_SIZE 2 ++#define NFC_LLCP_DIRECTION_RX 0x00 ++#define NFC_LLCP_DIRECTION_TX 0x01 ++ ++#endif /*__LINUX_NFC_H */ +Index: neard-0.8/plugins/mifare.c +=================================================================== +--- neard-0.8.orig/plugins/mifare.c 2012-10-10 05:29:07.000000000 +0200 ++++ neard-0.8/plugins/mifare.c 2012-12-09 16:58:22.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/p2p.c +=================================================================== +--- neard-0.8.orig/plugins/p2p.c 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/plugins/p2p.c 2012-12-09 16:59:06.000000000 +0100 +@@ -30,7 +30,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/handover.c +=================================================================== +--- neard-0.8.orig/plugins/handover.c 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/plugins/handover.c 2012-12-09 17:13:30.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/types.h> + #include <near/log.h> +Index: neard-0.8/plugins/nfctype1.c +=================================================================== +--- neard-0.8.orig/plugins/nfctype1.c 2012-10-10 05:29:07.000000000 +0200 ++++ neard-0.8/plugins/nfctype1.c 2012-12-09 17:09:13.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/nfctype2.c +=================================================================== +--- neard-0.8.orig/plugins/nfctype2.c 2012-10-10 05:29:07.000000000 +0200 ++++ neard-0.8/plugins/nfctype2.c 2012-12-09 17:09:52.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/nfctype3.c +=================================================================== +--- neard-0.8.orig/plugins/nfctype3.c 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/plugins/nfctype3.c 2012-12-09 17:11:51.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/nfctype4.c +=================================================================== +--- neard-0.8.orig/plugins/nfctype4.c 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/plugins/nfctype4.c 2012-12-09 17:12:14.000000000 +0100 +@@ -30,7 +30,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/npp.c +=================================================================== +--- neard-0.8.orig/plugins/npp.c 2012-10-10 05:29:07.000000000 +0200 ++++ neard-0.8/plugins/npp.c 2012-12-09 17:12:36.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> +Index: neard-0.8/plugins/snep.c +=================================================================== +--- neard-0.8.orig/plugins/snep.c 2012-11-03 19:56:07.000000000 +0100 ++++ neard-0.8/plugins/snep.c 2012-12-09 17:13:07.000000000 +0100 +@@ -29,7 +29,11 @@ + #include <sys/socket.h> + + #include <linux/socket.h> ++#ifdef HAVE_LINUX_NFC_H + #include <linux/nfc.h> ++#else ++#include "../src/linux-nfc.h" ++#endif + + #include <near/plugin.h> + #include <near/log.h> diff --git a/package/neard/neard.mk b/package/neard/neard.mk index 2d3e30e..3c9dd7c 100644 --- a/package/neard/neard.mk +++ b/package/neard/neard.mk @@ -8,6 +8,7 @@ NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc NEARD_LICENSE = GPLv2 NEARD_LICENSE_FILES = COPYING +NEARD_AUTORECONF = YES NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl NEARD_CONF_OPT = --disable-traces -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h> 2012-12-09 18:14 ` [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h> Thomas Petazzoni @ 2012-12-09 20:58 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:58 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Fixes: Thomas> http://autobuild.buildroot.org/results/bd1cb8795415b7369a9f4268b9f058cb78d4000d/build-end.log Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 8/8] libev: disable on avr32 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni ` (6 preceding siblings ...) 2012-12-09 18:14 ` [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h> Thomas Petazzoni @ 2012-12-09 18:14 ` Thomas Petazzoni 2012-12-09 20:59 ` Peter Korsgaard 7 siblings, 1 reply; 18+ messages in thread From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw) To: buildroot Fixes: http://autobuild.buildroot.org/results/4951121337fad670d8bf869483774ccf9e91dd47/build-end.log Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/libev/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libev/Config.in b/package/libev/Config.in index 71abe77..fd74f55 100644 --- a/package/libev/Config.in +++ b/package/libev/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBEV bool "libev" + # needs memory fences + depends on !BR2_avr32 help Userspace library for handling asynchronous notifications -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH 8/8] libev: disable on avr32 2012-12-09 18:14 ` [Buildroot] [PATCH 8/8] libev: disable on avr32 Thomas Petazzoni @ 2012-12-09 20:59 ` Peter Korsgaard 0 siblings, 0 replies; 18+ messages in thread From: Peter Korsgaard @ 2012-12-09 20:59 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Fixes: Thomas> http://autobuild.buildroot.org/results/4951121337fad670d8bf869483774ccf9e91dd47/build-end.log Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2012-12-09 20:59 UTC | newest] Thread overview: 18+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-12-09 18:13 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni 2012-12-09 18:13 ` [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms Thomas Petazzoni 2012-12-09 20:50 ` Peter Korsgaard 2012-12-09 18:13 ` [Buildroot] [PATCH 2/8] ccache: deprecate the target package Thomas Petazzoni 2012-12-09 20:51 ` Peter Korsgaard 2012-12-09 18:13 ` [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain Thomas Petazzoni 2012-12-09 20:53 ` Peter Korsgaard 2012-12-09 18:13 ` [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc Thomas Petazzoni 2012-12-09 20:56 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 5/8] bmon: needs MMU for fork() Thomas Petazzoni 2012-12-09 18:20 ` Thomas Petazzoni 2012-12-09 20:56 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap Thomas Petazzoni 2012-12-09 20:57 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h> Thomas Petazzoni 2012-12-09 20:58 ` Peter Korsgaard 2012-12-09 18:14 ` [Buildroot] [PATCH 8/8] libev: disable on avr32 Thomas Petazzoni 2012-12-09 20:59 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox