* [Buildroot] [git commit] libroxml: don't build docs
From: Peter Korsgaard @ 2012-12-09 20:28 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=59795cc98067fe2730e50dd3687fd94b6b36a843
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Don't build docs to avoid failures such as
http://autobuild.buildroot.net/results/3f1971472fe35a516b0f26ced477d33cb18280c9/
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/libroxml/libroxml.mk | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index d7ef6a4..6e690aa 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -30,4 +30,10 @@ define LIBROXML_CLEAN_CMDS
-$(MAKE) -C $(@D) clean
endef
+define LIBROXML_DISABLE_DOXYGEN
+ $(SED) 's:) doxy:):' $(@D)/Makefile
+endef
+
+LIBROXML_POST_PATCH_HOOKS += LIBROXML_DISABLE_DOXYGEN
+
$(eval $(generic-package))
^ permalink raw reply related
* [Buildroot] [PATCH] package/crosstool-ng: update to 1.17.0
From: Peter Korsgaard @ 2012-12-09 20:02 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1354564065-24388-2-git-send-email-c.schoenert@t-online.de>
>>>>> "Carsten" == Carsten Schoenert <c.schoenert@gmail.com> writes:
Carsten> From: Carsten Schoenert <c.schoenert@t-online.de>
Carsten> Updating current crosstool-ng config files to 1.17.0
Carsten> crosstool-ng.config-eglibc
Carsten> crosstool-ng.config-glibc
Carsten> crosstool-ng.config-uClibc
Unfortunately it doesn't seem to build here (ppl compilation issue):
[ERROR] /home/peko/source/buildroot/testctng/build/build-toolchain/.build/src/ppl-0.10.2/src/Interval.defs.hh:451:86: error: 'f_info' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
[ALL ] In file included from /home/peko/source/buildroot/testctng/build/build-toolchain/.build/src/ppl-0.10.2/src/Interval.defs.hh:980:0
Yann, Carsten - Any ideas? Googling around seems to suggest that this is
related to a host-gcc 4.7.x issue, but people are quite likely to be
using that nowadays, so what to do? Build with -fpermissive?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 0/51 v4] Add QEMU for runing on the target
From: Yann E. MORIN @ 2012-12-09 19:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121209194100.72987f2c@skate>
Thomas, All,
On Sunday 09 December 2012 Thomas Petazzoni wrote:
> On Sun, 9 Dec 2012 17:34:33 +0100, Yann E. MORIN wrote:
> > This patch series adds qemu as a package to run on the target.
> >
> > Although this may sound weird in a first place, I use it to build a
> > simple VM server.
>
> Do you have a public Git branch with all those patches, so that we can
> easily do some testing without having to apply manually all your
> patches?
For those interested, I've put up the series on gitorious:
git://gitorious.org/buildroot/buildroot.git
branch: yem-qemu
This branch already contains the removeal of the _AVAILABLE symbols,
spotted by Thomas.
I have no clue how to manage this, and I don't know (yet?) how I'll manage
to push updates to this branch, so do not expect any miracle! ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] libglib2: don't try to use DTrace/GCov/SystemTap for host build
From: Baruch Siach @ 2012-12-09 19:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355080604-27155-1-git-send-email-thomas.petazzoni@free-electrons.com>
Hi Thomas,
On Sun, Dec 09, 2012 at 08:16:44PM +0100, Thomas Petazzoni wrote:
> We really only need the host build of libglib2 for a few helper
> programs that are used for the target build of libglib2. Therefore,
> trying to use bells and whistles like DTrace, GCov and SystemTap is
> useful.
Not?
> And it is actually harmful, since it is causing build failures on the
> gcc110 PowerPC-based autobuilder that apparently has some
> DTrace-feature installed. This commit therefore fixes:
>
> http://autobuild.buildroot.org/results/1c62d1ce10937bd21f5afcb73782b939d10c2038/build-end.log
>
> Which has been polluting our autobuilder logs since several weeks now.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/libglib2/libglib2.mk | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> index a32cab2..4427431 100644
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -53,6 +53,9 @@ endif
> HOST_LIBGLIB2_CONF_OPT = \
> --disable-gtk-doc \
> --enable-debug=no \
> + --disable-dtrace \
> + --disable-systemtap \
> + --disable-gcov
>
> LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply
* [Buildroot] [PATCH v2] libglib2: don't try to use DTrace/GCov/SystemTap for host build
From: Thomas Petazzoni @ 2012-12-09 19:25 UTC (permalink / raw)
To: buildroot
We really only need the host build of libglib2 for a few helper
programs that are used for the target build of libglib2. Therefore,
trying to use bells and whistles like DTrace, GCov and SystemTap is
totally useless.
And it is actually harmful, since it is causing build failures on the
gcc110 PowerPC-based autobuilder that apparently has some
DTrace-feature installed. This commit therefore fixes:
http://autobuild.buildroot.org/results/1c62d1ce10937bd21f5afcb73782b939d10c2038/build-end.log
Which has been polluting our autobuilder logs since several weeks now.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
v2: fixed description, thanks to Samuel Martin for noticing
---
package/libglib2/libglib2.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index a32cab2..4427431 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -53,6 +53,9 @@ endif
HOST_LIBGLIB2_CONF_OPT = \
--disable-gtk-doc \
--enable-debug=no \
+ --disable-dtrace \
+ --disable-systemtap \
+ --disable-gcov
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH] libglib2: don't try to use DTrace/GCov/SystemTap for host build
From: Thomas Petazzoni @ 2012-12-09 19:16 UTC (permalink / raw)
To: buildroot
We really only need the host build of libglib2 for a few helper
programs that are used for the target build of libglib2. Therefore,
trying to use bells and whistles like DTrace, GCov and SystemTap is
useful.
And it is actually harmful, since it is causing build failures on the
gcc110 PowerPC-based autobuilder that apparently has some
DTrace-feature installed. This commit therefore fixes:
http://autobuild.buildroot.org/results/1c62d1ce10937bd21f5afcb73782b939d10c2038/build-end.log
Which has been polluting our autobuilder logs since several weeks now.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libglib2/libglib2.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index a32cab2..4427431 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -53,6 +53,9 @@ endif
HOST_LIBGLIB2_CONF_OPT = \
--disable-gtk-doc \
--enable-debug=no \
+ --disable-dtrace \
+ --disable-systemtap \
+ --disable-gcov
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
--
1.7.9.5
^ permalink raw reply related
* [Buildroot] [PATCH 21/51] package/libedit2: new package
From: Thomas Petazzoni @ 2012-12-09 18:52 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355070924-8009-22-git-send-email-yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 9 Dec 2012 17:34:54 +0100, Yann E. MORIN wrote:
> +LIBEDIT2_DEPENDENCIES = host-pmake libbsd ncurses
If I'm correct, this package is the only one that needs host-pmake, no?
If so, then seeing how simple libedit seems to be, I think a patch
adding a proper configure.ac + Makefile.am to libedit2, making its
build system correct, and independent of pmake, would be in fact a lot
easier.
It would avoid the huge pmake package that has gazillions of patches,
and would avoid the horrible mess in libedit2.mk to get the
installation step correct.
Since there has been no release of libedit2 since 2008, I don't expect
the patch to migrate to the autotools to become obsolete too fast :-)
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 20/51] package/libbsd: new package
From: Thomas Petazzoni @ 2012-12-09 18:46 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355070924-8009-21-git-send-email-yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 9 Dec 2012 17:34:53 +0100, Yann E. MORIN wrote:
> +LIBBSD_AUTORECONF = YES
> +LIBBSD_AUTORECONF_OPT = -f -i
Justification for AUTORECONF?
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 13/51] package/spice: new package
From: Thomas Petazzoni @ 2012-12-09 18:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355070924-8009-14-git-send-email-yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 9 Dec 2012 17:34:46 +0100, Yann E. MORIN wrote:
> +# We need to tweak spice.pc because it /forgets/ (for static linking) that
> +# it should link against libz and libjpeg. libz is pkg-config-aware, while
> +# libjpeg isn't, hence the two-line tweak
> +define SPICE_POST_INSTALL_STAGING_FIX_PC
> + $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
> + "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
> +endef
> +SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
Do you think it's possible to replace this by a patch that could be
upstreamed?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 12/51] package/slirp: new package
From: Thomas Petazzoni @ 2012-12-09 18:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355070924-8009-13-git-send-email-yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 9 Dec 2012 17:34:45 +0100, Yann E. MORIN wrote:
> +# Note: The license file 'COPYRIGHT' is missing from the sources,
> +# although some files refer to it.
> +SLIRP_INSTALL_STAGING = YES
> +SLIRP_AUTORECONF = YES
Justification for the _AUTORECONF=YES here?
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH 0/51 v4] Add QEMU for runing on the target
From: Thomas Petazzoni @ 2012-12-09 18:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355070924-8009-1-git-send-email-yann.morin.1998@free.fr>
Dear Yann E. MORIN,
On Sun, 9 Dec 2012 17:34:33 +0100, Yann E. MORIN wrote:
> This patch series adds qemu as a package to run on the target.
>
> Although this may sound weird in a first place, I use it to build a
> simple VM server.
Do you have a public Git branch with all those patches, so that we can
easily do some testing without having to apply manually all your
patches?
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [git commit] package/crosstool-ng: bumpimg default GCC version to 4.6.3
From: Peter Korsgaard @ 2012-12-09 18:27 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=5c22945d7560c4a5cf184441b8bba7e48c5d099e
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This bumps the GCC version from 4.4.6 to 4.6.3 to for
*.config-eglibc
*.config-glibc
*.config-uClibc
be equal to the default GCC setting in buildroot as well in addition to
commit b855154ee8683e87afa08c6cc50b716d22879922.
Signed-off-by: Carsten Schoenert <c.schoenert@t-online.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
.../crosstool-ng.config-eglibc | 26 ++++++++++++++++----
.../crosstool-ng.config-glibc | 26 ++++++++++++++++----
.../crosstool-ng.config-uClibc | 26 ++++++++++++++++----
3 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 1b523ec..11eb602 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# crosstool-NG 1.17.0 Configuration
-# Mon Dec 3 20:10:26 2012
+# Sat Dec 8 12:57:07 2012
#
CT_CONFIGURE_has_xz=y
CT_CONFIGURE_has_svn=y
@@ -265,10 +265,10 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
# C compiler
#
CT_CC="gcc"
-CT_CC_VERSION="4.4.6"
+CT_CC_VERSION="4.6.3"
CT_CC_gcc=y
# CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_6_3 is not set
+CT_CC_V_4_6_3=y
# CT_CC_V_4_6_2 is not set
# CT_CC_V_4_6_1 is not set
# CT_CC_V_4_6_0 is not set
@@ -277,7 +277,7 @@ CT_CC_gcc=y
# CT_CC_V_4_5_1 is not set
# CT_CC_V_4_5_0 is not set
# CT_CC_V_4_4_7 is not set
-CT_CC_V_4_4_6=y
+# CT_CC_V_4_4_6 is not set
# CT_CC_V_4_4_5 is not set
# CT_CC_V_4_4_4 is not set
# CT_CC_V_4_4_3 is not set
@@ -294,12 +294,18 @@ CT_CC_V_4_4_6=y
# CT_CC_V_4_2_2 is not set
CT_CC_GCC_4_2_or_later=y
CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6=y
+CT_CC_GCC_4_6_or_later=y
CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
CT_CC_GCC_USE_GMP_MPFR=y
CT_CC_GCC_USE_PPL_CLOOG=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
# CT_CC_LANG_FORTRAN is not set
CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
@@ -326,6 +332,7 @@ CT_CC_STATIC_LIBSTDCXX=y
# Optimisation features
#
CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
#
# Settings for libraries running on target
@@ -334,6 +341,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
# CT_CC_GCC_LIBMUDFLAP is not set
# CT_CC_GCC_LIBGOMP is not set
# CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
#
# Misc. obscure options.
@@ -342,6 +350,7 @@ CT_CC_CXA_ATEXIT=y
# CT_CC_GCC_DISABLE_PCH is not set
CT_CC_GCC_SJLJ_EXCEPTIONS=m
CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
#
# C-library
@@ -445,11 +454,13 @@ CT_GMP_NEEDED=y
CT_MPFR_NEEDED=y
CT_PPL_NEEDED=y
CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
CT_COMPLIBS=y
CT_GMP=y
CT_MPFR=y
CT_PPL=y
CT_CLOOG=y
+CT_MPC=y
# CT_GMP_V_5_0_2 is not set
# CT_GMP_V_5_0_1 is not set
CT_GMP_V_4_3_2=y
@@ -475,6 +486,11 @@ CT_CLOOG_V_0_15_9=y
# CT_CLOOG_V_0_15_7 is not set
# CT_CLOOG_V_0_15_6 is not set
CT_CLOOG_VERSION="0.15.9"
+CT_MPC_V_0_9=y
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="0.9"
#
# Companion libraries common options
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index 026c7fd..c30a115 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# crosstool-NG 1.17.0 Configuration
-# Mon Dec 3 20:16:52 2012
+# Sat Dec 8 12:56:02 2012
#
CT_CONFIGURE_has_xz=y
CT_CONFIGURE_has_svn=y
@@ -265,10 +265,10 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
# C compiler
#
CT_CC="gcc"
-CT_CC_VERSION="4.4.6"
+CT_CC_VERSION="4.6.3"
CT_CC_gcc=y
# CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_6_3 is not set
+CT_CC_V_4_6_3=y
# CT_CC_V_4_6_2 is not set
# CT_CC_V_4_6_1 is not set
# CT_CC_V_4_6_0 is not set
@@ -277,7 +277,7 @@ CT_CC_gcc=y
# CT_CC_V_4_5_1 is not set
# CT_CC_V_4_5_0 is not set
# CT_CC_V_4_4_7 is not set
-CT_CC_V_4_4_6=y
+# CT_CC_V_4_4_6 is not set
# CT_CC_V_4_4_5 is not set
# CT_CC_V_4_4_4 is not set
# CT_CC_V_4_4_3 is not set
@@ -294,12 +294,18 @@ CT_CC_V_4_4_6=y
# CT_CC_V_4_2_2 is not set
CT_CC_GCC_4_2_or_later=y
CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6=y
+CT_CC_GCC_4_6_or_later=y
CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
CT_CC_GCC_USE_GMP_MPFR=y
CT_CC_GCC_USE_PPL_CLOOG=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
# CT_CC_LANG_FORTRAN is not set
CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
@@ -326,6 +332,7 @@ CT_CC_STATIC_LIBSTDCXX=y
# Optimisation features
#
CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
#
# Settings for libraries running on target
@@ -334,6 +341,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
# CT_CC_GCC_LIBMUDFLAP is not set
# CT_CC_GCC_LIBGOMP is not set
# CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
#
# Misc. obscure options.
@@ -342,6 +350,7 @@ CT_CC_CXA_ATEXIT=y
# CT_CC_GCC_DISABLE_PCH is not set
CT_CC_GCC_SJLJ_EXCEPTIONS=m
CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
#
# C-library
@@ -434,11 +443,13 @@ CT_GMP_NEEDED=y
CT_MPFR_NEEDED=y
CT_PPL_NEEDED=y
CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
CT_COMPLIBS=y
CT_GMP=y
CT_MPFR=y
CT_PPL=y
CT_CLOOG=y
+CT_MPC=y
# CT_GMP_V_5_0_2 is not set
# CT_GMP_V_5_0_1 is not set
CT_GMP_V_4_3_2=y
@@ -464,6 +475,11 @@ CT_CLOOG_V_0_15_9=y
# CT_CLOOG_V_0_15_7 is not set
# CT_CLOOG_V_0_15_6 is not set
CT_CLOOG_VERSION="0.15.9"
+CT_MPC_V_0_9=y
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="0.9"
#
# Companion libraries common options
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 8ad481f..e93128b 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# crosstool-NG 1.17.0 Configuration
-# Mon Dec 3 20:17:58 2012
+# Sat Dec 8 12:50:22 2012
#
CT_CONFIGURE_has_xz=y
CT_CONFIGURE_has_svn=y
@@ -264,10 +264,10 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
# C compiler
#
CT_CC="gcc"
-CT_CC_VERSION="4.4.6"
+CT_CC_VERSION="4.6.3"
CT_CC_gcc=y
# CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_6_3 is not set
+CT_CC_V_4_6_3=y
# CT_CC_V_4_6_2 is not set
# CT_CC_V_4_6_1 is not set
# CT_CC_V_4_6_0 is not set
@@ -276,7 +276,7 @@ CT_CC_gcc=y
# CT_CC_V_4_5_1 is not set
# CT_CC_V_4_5_0 is not set
# CT_CC_V_4_4_7 is not set
-CT_CC_V_4_4_6=y
+# CT_CC_V_4_4_6 is not set
# CT_CC_V_4_4_5 is not set
# CT_CC_V_4_4_4 is not set
# CT_CC_V_4_4_3 is not set
@@ -293,12 +293,18 @@ CT_CC_V_4_4_6=y
# CT_CC_V_4_2_2 is not set
CT_CC_GCC_4_2_or_later=y
CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_4_5_or_later=y
+CT_CC_GCC_4_6=y
+CT_CC_GCC_4_6_or_later=y
CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_HAS_LTO=y
CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_HAS_BUILD_ID=y
CT_CC_GCC_USE_GMP_MPFR=y
CT_CC_GCC_USE_PPL_CLOOG=y
+CT_CC_GCC_USE_MPC=y
+CT_CC_GCC_HAS_LIBQUADMATH=y
# CT_CC_LANG_FORTRAN is not set
CT_CC_SUPPORT_CXX=y
CT_CC_SUPPORT_FORTRAN=y
@@ -325,6 +331,7 @@ CT_CC_STATIC_LIBSTDCXX=y
# Optimisation features
#
CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
#
# Settings for libraries running on target
@@ -333,6 +340,7 @@ CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
# CT_CC_GCC_LIBMUDFLAP is not set
# CT_CC_GCC_LIBGOMP is not set
# CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
#
# Misc. obscure options.
@@ -341,6 +349,7 @@ CT_CC_CXA_ATEXIT=y
# CT_CC_GCC_DISABLE_PCH is not set
CT_CC_GCC_SJLJ_EXCEPTIONS=m
CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
#
# C-library
@@ -416,11 +425,13 @@ CT_GMP_NEEDED=y
CT_MPFR_NEEDED=y
CT_PPL_NEEDED=y
CT_CLOOG_NEEDED=y
+CT_MPC_NEEDED=y
CT_COMPLIBS=y
CT_GMP=y
CT_MPFR=y
CT_PPL=y
CT_CLOOG=y
+CT_MPC=y
# CT_GMP_V_5_0_2 is not set
# CT_GMP_V_5_0_1 is not set
CT_GMP_V_4_3_2=y
@@ -446,6 +457,11 @@ CT_CLOOG_V_0_15_9=y
# CT_CLOOG_V_0_15_7 is not set
# CT_CLOOG_V_0_15_6 is not set
CT_CLOOG_VERSION="0.15.9"
+CT_MPC_V_0_9=y
+# CT_MPC_V_0_8_2 is not set
+# CT_MPC_V_0_8_1 is not set
+# CT_MPC_V_0_7 is not set
+CT_MPC_VERSION="0.9"
#
# Companion libraries common options
^ permalink raw reply related
* [Buildroot] [PATCH 5/8] bmon: needs MMU for fork()
From: Thomas Petazzoni @ 2012-12-09 18:20 UTC (permalink / raw)
To: buildroot
In-Reply-To: <d3711ead28655ab34fded4452b0410dd13c192b1.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH] fluxbox: fix build against imlib2
From: Samuel Martin @ 2012-12-09 18:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1355077123-5948-1-git-send-email-s.martin49@gmail.com>
* fix configure.in to take care of the given imlib2-prefix
* disable imlib2 support if imlib2 is not part of the selection
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/fluxbox/fluxbox-1.3.2-fix-configure.patch | 19 +++++++++++++++++++
package/fluxbox/fluxbox.mk | 10 +++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 package/fluxbox/fluxbox-1.3.2-fix-configure.patch
diff --git a/package/fluxbox/fluxbox-1.3.2-fix-configure.patch b/package/fluxbox/fluxbox-1.3.2-fix-configure.patch
new file mode 100644
index 0000000..2cb8273
--- /dev/null
+++ b/package/fluxbox/fluxbox-1.3.2-fix-configure.patch
@@ -0,0 +1,19 @@
+Avoid to call the imlib2-config that may be installed on the host system
+(even when --with-imlib2-prefix or --with-imlib2-exec-prefix is passed to
+the configure script), which totally screws up the resulting linker flags.
+
+Inspired by: http://git.fluxbox.org/fluxbox.git/commit/?id=b178bed60b5bd8b2c9ed0cbc67fd729ff3820589
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+--- fluxbox-1.3.2.orig/configure.in 2012-10-21 16:11:59.445749396 +0200
++++ fluxbox-1.3.2/configure.in 2012-10-21 16:35:27.658390856 +0200
+@@ -443,8 +443,6 @@ if test x$enable_imlib2 = "xyes"; then
+ [
+ IMLIB2=true
+ AC_DEFINE(HAVE_IMLIB2, [], [Imlib2 support])
+- IMLIB2_LIBS=`imlib2-config --libs`
+- IMLIB2_CFLAGS=`imlib2-config --cflags`
+ LIBS="$LIBS $IMLIB2_LIBS"
+ CXXFLAGS="$CXXFLAGS $IMLIB2_CFLAGS"
+ ], [ AC_MSG_RESULT(no)]
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
index 356c5a2..04ffb91 100644
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -10,11 +10,19 @@ FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBO
FLUXBOX_LICENSE = MIT
FLUXBOX_LICENSE_FILES = COPYING
+FLUXBOX_AUTORECONF = YES
+
FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
-
FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+ifeq ($(BR2_PACKAGE_IMLIB2),y)
+FLUXBOX_CONF_OPT += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
+FLUXBOX_DEPENDENCIES += imlib2
+else
+FLUXBOX_CONF_OPT += --disable-imlib2
+endif
+
define FLUXBOX_INSTALL_XSESSION_FILE
[ -f $(TARGET_DIR)/root/.xsession ] || $(INSTALL) -m 0755 -D \
package/fluxbox/xsession $(TARGET_DIR)/root/.xsession
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH] matchbox-lib: fix license info
From: Samuel Martin @ 2012-12-09 18:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/matchbox/matchbox-lib/matchbox-lib.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
index 7730d94..d18df6b 100644
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -7,7 +7,7 @@
MATCHBOX_LIB_VERSION = 1.9
MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
-MATCHBOX_LIB_LICENSE = LGPLv2.1
+MATCHBOX_LIB_LICENSE = LGPLv2.1+
MATCHBOX_LIB_LICENSE_FILES = COPYING
MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
--
1.8.0.1
^ permalink raw reply related
* [Buildroot] [PATCH 07/33] fluxbox: fix build against imlib2
From: Samuel Martin @ 2012-12-09 18:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <878v9sfzpg.fsf@dell.be.48ers.dk>
Hi Peter, all,
2012/11/23 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
>
> Samuel> * fix missing dependency
> Samuel> * set imlib2 prefix at configure time
> Samuel> * fix configure script to take account of the imlib2 prefix if any
>
> Ehh, fluxbox doesn't select imlib2 in it's Config.in and it looks like
> it's an optional dependency:
>
> From configure.in:
>
> dnl Check whether to use imlib2
> IMLIB2=false
> AC_MSG_CHECKING([whether to have Imlib2 (pixmap themes) support])
> AC_ARG_ENABLE(imlib2,
> AC_HELP_STRING([--enable-imlib2],
> [Imlib2 (pixmap themes) support ([default=yes])]), ,
> [enable_imlib2=yes])
>
> So all of this should only be done if BR2_PACKAGE_IMLIB2 is enabled.
Right, I'll recook the patch.
>
> Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Samuel> ---
> Samuel> package/fluxbox/fluxbox-fix-configure.patch | 19 +++++++++++++++++++
>
> Please consider sending this patch upstream.
Done.
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH 8/8] libev: disable on avr32
From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH 7/8] neard: fix build failure caused by missing <linux/nfc.h>
From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
Fixes:
http://autobuild.buildroot.org/results/bd1cb8795415b7369a9f4268b9f058cb78d4000d/build-end.log
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 387 ++++++++++++++++++++
package/neard/neard.mk | 1 +
2 files changed, 388 insertions(+)
create mode 100644 package/neard/neard-fix-missing-linux-nfc-header.patch
--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
* [Buildroot] [PATCH 6/8] xapp_xmh: add dependency on xdata_xbitmap
From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH 5/8] bmon: needs MMU for fork()
From: Thomas Petazzoni @ 2012-12-09 18:14 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH 4/8] rt-tests: not available on avr32, too old uClibc
From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH 3/8] rt-tests: requires thread support in the toolchain
From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH 2/8] ccache: deprecate the target package
From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [PATCH 1/8] ccache: uses fork(), there only usable on MMU platforms
From: Thomas Petazzoni @ 2012-12-09 18:13 UTC (permalink / raw)
To: buildroot
In-Reply-To: <cover.1355076808.git.thomas.petazzoni@free-electrons.com>
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
* [Buildroot] [pull request] Pull request for branch misc-fixes
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
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox