* [Buildroot] [PATCH 3/3] core: add "cmake3" to the list of cmake candidates
From: Carlos Santos @ 2017-05-05 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-1-git-send-email-casantos@datacom.ind.br>
This is useful on CentOS 7, whose "cmake" utility corresponds to version
2.8.12, which is too old for Buildroot.
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
support/dependencies/check-host-cmake.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
index 42aaee4..f2eef8b 100644
--- a/support/dependencies/check-host-cmake.mk
+++ b/support/dependencies/check-host-cmake.mk
@@ -10,7 +10,7 @@
#
BR2_CMAKE_VERSION_MIN = 3.1
-BR2_CMAKE_CANDIDATES ?= cmake
+BR2_CMAKE_CANDIDATES ?= cmake cmake3
BR2_CMAKE ?= $(call suitable-host-package,cmake,\
$(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
ifeq ($(BR2_CMAKE),)
--
1.8.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 2/3] core: allow having a list of "cmake" candidates
From: Carlos Santos @ 2017-05-05 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-1-git-send-email-casantos@datacom.ind.br>
Add the BR2_CMAKE_CANDIDATES variable, containing a list of candidates
to check and use as BR2_CMAKE, if possible.
This allows using "cmake3" on CentOS 7, whose default cmake corresponds
to version 2.8.12. Example:
$ make BR2_CMAKE_CANDIDATES="cmake cmake3"
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
support/dependencies/check-host-cmake.mk | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
index 8002278..42aaee4 100644
--- a/support/dependencies/check-host-cmake.mk
+++ b/support/dependencies/check-host-cmake.mk
@@ -10,9 +10,10 @@
#
BR2_CMAKE_VERSION_MIN = 3.1
-BR2_CMAKE ?= cmake
-ifeq ($(call suitable-host-package,cmake,\
- $(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),)
+BR2_CMAKE_CANDIDATES ?= cmake
+BR2_CMAKE ?= $(call suitable-host-package,cmake,\
+ $(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
+ifeq ($(BR2_CMAKE),)
BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
BR2_CMAKE_HOST_DEPENDENCY = host-cmake
endif
--
1.8.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
From: Carlos Santos @ 2017-05-05 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-1-git-send-email-casantos@datacom.ind.br>
On CentOS 7 the "cmake" package installs cmake 2.8.12, which is too old
for us but the "cmake3" package (from EPEL) provides cmake 3.6.3, which
is good enough.
This change allows passing a list of candidates and the minimal version
to check-host-cmake.sh. Examples (on CentOS 7):
$ sh support/dependencies/check-host-cmake.sh cmake cmake3 2.8
/usr/bin/cmake
$ sh support/dependencies/check-host-cmake.sh cmake cmake3 3.1
/usr/bin/cmake3
$ sh support/dependencies/check-host-cmake.sh cmake cmake3 3.8
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
support/dependencies/check-host-cmake.sh | 66 ++++++++++++++++----------------
1 file changed, 34 insertions(+), 32 deletions(-)
diff --git a/support/dependencies/check-host-cmake.sh b/support/dependencies/check-host-cmake.sh
index 9b63b06..09ae8cc 100755
--- a/support/dependencies/check-host-cmake.sh
+++ b/support/dependencies/check-host-cmake.sh
@@ -1,39 +1,41 @@
#!/bin/sh
-candidate="${1}"
-version_min="${2}"
+eval 'version_min="${'${#}'}"'
major_min="${version_min%.*}"
minor_min="${version_min#*.}"
-cmake=`which ${candidate}`
-if [ ! -x "${cmake}" ]; then
- # echo nothing: no suitable cmake found
- exit 1
-fi
-
-# Extract version X.Y from versions in the form X.Y or X.Y.Z
-# with X, Y and Z numbers with one or more digits each, e.g.
-# 3.2 -> 3.2
-# 3.2.3 -> 3.2
-# 3.2.42 -> 3.2
-# 3.10 -> 3.10
-# 3.10.4 -> 3.10
-# 3.10.42 -> 3.10
-version="$(${cmake} --version \
- |sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \
- -e 's//\1/'
- )"
-major="${version%.*}"
-minor="${version#*.}"
-
-if [ ${major} -gt ${major_min} ]; then
- echo "${cmake}"
-else
- if [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then
- echo "${cmake}"
- else
- # echo nothing: no suitable cmake found
- exit 1
+while [ $# -gt 1 ]; do
+
+ cmake=`which "${1}" 2>/dev/null`
+
+ if [ -x "${cmake}" ]; then
+ # Extract version X.Y from versions in the form X.Y or X.Y.Z
+ # with X, Y and Z numbers with one or more digits each, e.g.
+ # 3.2 -> 3.2
+ # 3.2.3 -> 3.2
+ # 3.2.42 -> 3.2
+ # 3.10 -> 3.10
+ # 3.10.4 -> 3.10
+ # 3.10.42 -> 3.10
+ version="$(${cmake} --version \
+ |sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \
+ -e 's//\1/'
+ )"
+ major="${version%.*}"
+ minor="${version#*.}"
+
+ if [ ${major} -gt ${major_min} ]; then
+ echo "${cmake}"
+ exit
+ elif [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then
+ echo "${cmake}"
+ exit
+ fi
fi
-fi
+
+ shift
+done
+
+# echo nothing: no suitable cmake found
+exit 1
--
1.8.3.1
^ permalink raw reply related
* [Buildroot] [PATCH 0/3] Support a list of "cmake" candidates
From: Carlos Santos @ 2017-05-05 20:30 UTC (permalink / raw)
To: buildroot
On CentOS 7 the "cmake" package installs cmake 2.8.12, which is too old
for us but the "cmake3" package (from EPEL) provides cmake 3.6.3, which
is good enough.
This series adds support to a list of candidates to be checked instead
of resorting to host-cmake if "cmake" does not exist or is too old.
Patch 1 modifies check-host-cmake.sh to support a list of candidates and
the minimal version, keeping compatibility with the previous syntax.
Patch 2 Introduces the BR2_CMAKE_CANDIDATES in check-host-cmake.mk, still
keeping compatible with the previous behavior.
Patch 3 adds "cmake3" to the list of cmake candidates.
Carlos Santos (3):
core: allow check-host-cmake.sh to check several candidates
core: allow having a list of "cmake" candidates
core: add "cmake3" to the list of cmake candidates
support/dependencies/check-host-cmake.mk | 7 ++--
support/dependencies/check-host-cmake.sh | 66 ++++++++++++++++----------------
2 files changed, 38 insertions(+), 35 deletions(-)
--
1.8.3.1
^ permalink raw reply
* [Buildroot] [git commit] package/kyua: fix unmet dependencies
From: Peter Korsgaard @ 2017-05-05 19:57 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=a65da16f630cea87fd0527ce73df0b529b73946c
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
lutok is a lua module, so it depends on ! static libs. However, the
dependency is implicit, being done because the lua modules are sourced
globally under an if-block, and thus it is not easy to find that
dependency.
Propagate that dependency to kyua, which was missing it (because it is
not a lua module, so was missing the dependency).
[Peter: also update toolchain comment]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/kyua/Config.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/kyua/Config.in b/package/kyua/Config.in
index 4f887b0..4fc5e09 100644
--- a/package/kyua/Config.in
+++ b/package/kyua/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_KYUA
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_HAS_LUAINTERPRETER # lutok
depends on !BR2_PACKAGE_LUAJIT # lutok
+ depends on !BR2_STATIC_LIBS # lutok
depends on BR2_USE_MMU # atf
select BR2_PACKAGE_ATF
select BR2_PACKAGE_LUTOK
@@ -16,7 +17,7 @@ config BR2_PACKAGE_KYUA
https://github.com/jmmv/kyua
-comment "kyua needs a toolchain w/ C++ and full Lua"
- depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT
+comment "kyua needs a toolchain w/ C++, dynamic library and full Lua"
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT || BR2_STATIC_LIBS
depends on BR2_PACKAGE_HAS_LUAINTERPRETER
depends on BR2_USE_MMU
^ permalink raw reply related
* [Buildroot] [PATCH] package/kyua: fix unmet dependencies
From: Peter Korsgaard @ 2017-05-05 19:57 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505190826.11902-1-yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> lutok is a lua module, so it depends on ! static libs. However, the
> dependency is implicit, being done because the lua modules are sourced
> globally under an if-block, and thus it is not easy to find that
> dependency.
> Propagate that dependency to kyua, which was missing it (because it is
> not a lua module, so was missing the dependency).
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
> ---
> package/kyua/Config.in | 1 +
> 1 file changed, 1 insertion(+)
> diff --git a/package/kyua/Config.in b/package/kyua/Config.in
> index 4f887b0e0a..6444b8c9e0 100644
> --- a/package/kyua/Config.in
> +++ b/package/kyua/Config.in
> @@ -3,6 +3,7 @@ config BR2_PACKAGE_KYUA
> depends on BR2_INSTALL_LIBSTDCPP
> depends on BR2_PACKAGE_HAS_LUAINTERPRETER # lutok
> depends on !BR2_PACKAGE_LUAJIT # lutok
> + depends on !BR2_STATIC_LIBS # lutok
> depends on BR2_USE_MMU # atf
> select BR2_PACKAGE_ATF
> select BR2_PACKAGE_LUTOK
Committed after propagating this dependency to the toolchain comment as
well, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] nvidia-driver: use http:// instead of ftp://
From: Peter Korsgaard @ 2017-05-05 19:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170504211339.89DD382859@busybox.osuosl.org>
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> commit: https://git.buildroot.net/buildroot/commit/?id=2068c7c6a810cdaf55240faf15c226ce3b308f1b
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> Fixes the download, which currently times out on http://.
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit branch/2017.02.x] nvidia-driver: use http:// instead of ftp://
From: Peter Korsgaard @ 2017-05-05 19:42 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=09fd512c8a15f157ee38597c67488e21f10d1117
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.02.x
Fixes the download, which currently times out on ftp://.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit 2068c7c6a810cdaf55240faf15c226ce3b308f1b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/nvidia-driver/nvidia-driver.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index cb9b7fa..20beec8 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -6,7 +6,7 @@
NVIDIA_DRIVER_VERSION = 375.20
NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
-NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
+NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run
NVIDIA_DRIVER_LICENSE = NVIDIA Software License
NVIDIA_DRIVER_LICENSE_FILES = LICENSE
^ permalink raw reply related
* [Buildroot] [git commit] linux-headers: bump 4.{4, 9, 10}.x series
From: Peter Korsgaard @ 2017-05-05 19:41 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170504072922.C27FC8270B@busybox.osuosl.org>
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> commit: https://git.buildroot.net/buildroot/commit/?id=15a31470b0381fc0a77cafbc5ed63c8578a163ff
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit branch/2017.02.x] linux-headers: bump 4.{4, 9, 10}.x series
From: Peter Korsgaard @ 2017-05-05 19:37 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=f7d6bf3dda7982aa4fc9213bb763481915cc451b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.02.x
[Peter: drop 4.10.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 15a31470b0381fc0a77cafbc5ed63c8578a163ff)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index fc3108b..205806a 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -222,7 +222,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
default "4.1.39" if BR2_KERNEL_HEADERS_4_1
- default "4.4.65" if BR2_KERNEL_HEADERS_4_4
+ default "4.4.66" if BR2_KERNEL_HEADERS_4_4
default "4.8.17" if BR2_KERNEL_HEADERS_4_8
- default "4.9.25" if BR2_KERNEL_HEADERS_4_9
+ default "4.9.26" if BR2_KERNEL_HEADERS_4_9
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
^ permalink raw reply related
* [Buildroot] [PATCH 2/2] picocom: force target LDFLAGS
From: Peter Korsgaard @ 2017-05-05 19:35 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87d1bpd9iu.fsf@dell.be.48ers.dk>
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Hi,
>>> Committed, thanks.
>>>
>>> Is this only an issue for picocom 2.2, or also something we should
>>> backport for the 2017.02.x branch?
>> Version 2.1 is also affected. But I'm not sure the issue is bad enough for a
>> backport.
Committed to 2017.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit branch/2017.02.x] picocom: force target LDFLAGS
From: Peter Korsgaard @ 2017-05-05 19:35 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=4a33076ffb68b9d90e6a918d4cb86f2740c2c824
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2017.02.x
This allows a static build of picocom when BR2_STATIC_LIBS=y but the toolchain
provides static and shared libraries.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit add51b89bfb5ebe7b533e14714088a4d3912c9a0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/picocom/picocom.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index 59a749f..e0e817e 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -10,7 +10,8 @@ PICOCOM_LICENSE = GPLv2+
PICOCOM_LICENSE_FILES = LICENSE.txt
define PICOCOM_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
+ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
endef
define PICOCOM_INSTALL_TARGET_CMDS
^ permalink raw reply related
* [Buildroot] [PATCH] gmp: Enable ASM for ARC again
From: Peter Korsgaard @ 2017-05-05 19:26 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505123520.45502-1-abrodkin@synopsys.com>
>>>>> "Alexey" == Alexey Brodkin <Alexey.Brodkin@synopsys.com> writes:
> This commit reverts cdf63517de25 "gmp: disable assembly for arc"
> as in GMP v6.1.2 there's already a proper fix for ASM constraints, see
> https://gmplib.org/repo/gmp/rev/58879634af3ci
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] gmp: Enable ASM for ARC again
From: Peter Korsgaard @ 2017-05-05 19:26 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=ec4c7b140cf59928d82a3e462a9924bdc8743d96
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This commit reverts cdf63517de25 "gmp: disable assembly for arc"
as in GMP v6.1.2 there's already a proper fix for ASM constraints, see
https://gmplib.org/repo/gmp/rev/58879634af3ci
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/gmp/gmp.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 5ea79ae..7236e37 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -15,7 +15,7 @@ HOST_GMP_DEPENDENCIES = host-m4
# GMP doesn't support assembly for coldfire or mips r6 ISA yet
# Disable for ARM v7m since it has different asm constraints
-ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M)$(BR2_arc),y)
+ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M),y)
GMP_CONF_OPTS += --disable-assembly
endif
^ permalink raw reply related
* [Buildroot] [PATCH 1/1] fix help text wrapping for configs starting with 'a'
From: Thomas Petazzoni @ 2017-05-05 19:23 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505103343.27171-1-aduskett@codeblue.com>
Hello,
On Fri, 5 May 2017 06:33:43 -0400, Adam Duskett wrote:
> - Program to change the display mode of Allwinner ARM SOCs running
> - the linux-sunxi kernel (and not the mainline kernel.)
> + Program to change the display mode of Allwinner
> + ARM SOCs running the linux-sunxi kernel
This rewrapping is wrong, the first line should end with "ARM SOCs", so
only the word "running" should be on the next line.
Please verify globally, ideally by using a tool that rewraps
automatically to the correct length.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH] libnl: bump to version 3.3.0
From: Peter Korsgaard @ 2017-05-05 19:21 UTC (permalink / raw)
To: buildroot
In-Reply-To: <e9a0eaeb1c229f466436422a54e7723175889f81.1493921149.git.baruch@tkos.co.il>
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Drop upstream patches. Renumber remaining patches.
> Add a revert of upstream patch to fix static build. Upstream pull request
> (#141) is pending.
> Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] libnl: bump to version 3.3.0
From: Peter Korsgaard @ 2017-05-05 19:20 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=e8e20c8022fe11efe1831df5d6fdd2542f271991
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Drop upstream patches. Renumber remaining patches.
Add a revert of upstream patch to fix static build. Upstream pull request
(#141) is pending.
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
...bs.private-field-in-libnl-pkg-config-fil.patch} | 0
| 756 ---------------------
...usl-workaround-to-the-libc-compat.h-copy.patch} | 0
...rt-build-enable-building-cli-during-tests.patch | 115 ++++
...usage-of-strerror_l-if-it-doesn-t-exist-i.patch | 106 ---
package/libnl/libnl.hash | 5 +-
package/libnl/libnl.mk | 6 +-
7 files changed, 119 insertions(+), 869 deletions(-)
diff --git a/package/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch b/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
similarity index 100%
rename from package/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
rename to package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
diff --git a/package/libnl/0001-fix-libc-kernel-headers-conflict.patch b/package/libnl/0001-fix-libc-kernel-headers-conflict.patch
deleted file mode 100644
index d9dfc6e..0000000
--- a/package/libnl/0001-fix-libc-kernel-headers-conflict.patch
+++ /dev/null
@@ -1,756 +0,0 @@
-Fix libc kernel headers conflict
-
-Add missing kernel headers to fix conflicts with toolchain provided kernel
-headers of older versions.
-
-This patch is equivalent to upstream commit 6c7f4215003 ("build: distribute
-in.h in6.h libc-compat.h"). These files are present in upstream git repo, but
-are missing from the distributed tarball.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-
---- /dev/null
-+++ b/include/linux-private/linux/in.h
-@@ -0,0 +1,299 @@
-+/*
-+ * INET An implementation of the TCP/IP protocol suite for the LINUX
-+ * operating system. INET is implemented using the BSD Socket
-+ * interface as the means of communication with the user level.
-+ *
-+ * Definitions of the Internet Protocol.
-+ *
-+ * Version: @(#)in.h 1.0.1 04/21/93
-+ *
-+ * Authors: Original taken from the GNU Project <netinet/in.h> file.
-+ * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.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.
-+ */
-+#ifndef _LINUX_IN_H
-+#define _LINUX_IN_H
-+
-+#include <linux/types.h>
-+#include <linux/libc-compat.h>
-+#include <linux/socket.h>
-+
-+#if __UAPI_DEF_IN_IPPROTO
-+/* Standard well-defined IP protocols. */
-+enum {
-+ IPPROTO_IP = 0, /* Dummy protocol for TCP */
-+#define IPPROTO_IP IPPROTO_IP
-+ IPPROTO_ICMP = 1, /* Internet Control Message Protocol */
-+#define IPPROTO_ICMP IPPROTO_ICMP
-+ IPPROTO_IGMP = 2, /* Internet Group Management Protocol */
-+#define IPPROTO_IGMP IPPROTO_IGMP
-+ IPPROTO_IPIP = 4, /* IPIP tunnels (older KA9Q tunnels use 94) */
-+#define IPPROTO_IPIP IPPROTO_IPIP
-+ IPPROTO_TCP = 6, /* Transmission Control Protocol */
-+#define IPPROTO_TCP IPPROTO_TCP
-+ IPPROTO_EGP = 8, /* Exterior Gateway Protocol */
-+#define IPPROTO_EGP IPPROTO_EGP
-+ IPPROTO_PUP = 12, /* PUP protocol */
-+#define IPPROTO_PUP IPPROTO_PUP
-+ IPPROTO_UDP = 17, /* User Datagram Protocol */
-+#define IPPROTO_UDP IPPROTO_UDP
-+ IPPROTO_IDP = 22, /* XNS IDP protocol */
-+#define IPPROTO_IDP IPPROTO_IDP
-+ IPPROTO_TP = 29, /* SO Transport Protocol Class 4 */
-+#define IPPROTO_TP IPPROTO_TP
-+ IPPROTO_DCCP = 33, /* Datagram Congestion Control Protocol */
-+#define IPPROTO_DCCP IPPROTO_DCCP
-+ IPPROTO_IPV6 = 41, /* IPv6-in-IPv4 tunnelling */
-+#define IPPROTO_IPV6 IPPROTO_IPV6
-+ IPPROTO_RSVP = 46, /* RSVP Protocol */
-+#define IPPROTO_RSVP IPPROTO_RSVP
-+ IPPROTO_GRE = 47, /* Cisco GRE tunnels (rfc 1701,1702) */
-+#define IPPROTO_GRE IPPROTO_GRE
-+ IPPROTO_ESP = 50, /* Encapsulation Security Payload protocol */
-+#define IPPROTO_ESP IPPROTO_ESP
-+ IPPROTO_AH = 51, /* Authentication Header protocol */
-+#define IPPROTO_AH IPPROTO_AH
-+ IPPROTO_MTP = 92, /* Multicast Transport Protocol */
-+#define IPPROTO_MTP IPPROTO_MTP
-+ IPPROTO_BEETPH = 94, /* IP option pseudo header for BEET */
-+#define IPPROTO_BEETPH IPPROTO_BEETPH
-+ IPPROTO_ENCAP = 98, /* Encapsulation Header */
-+#define IPPROTO_ENCAP IPPROTO_ENCAP
-+ IPPROTO_PIM = 103, /* Protocol Independent Multicast */
-+#define IPPROTO_PIM IPPROTO_PIM
-+ IPPROTO_COMP = 108, /* Compression Header Protocol */
-+#define IPPROTO_COMP IPPROTO_COMP
-+ IPPROTO_SCTP = 132, /* Stream Control Transport Protocol */
-+#define IPPROTO_SCTP IPPROTO_SCTP
-+ IPPROTO_UDPLITE = 136, /* UDP-Lite (RFC 3828) */
-+#define IPPROTO_UDPLITE IPPROTO_UDPLITE
-+ IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */
-+#define IPPROTO_MPLS IPPROTO_MPLS
-+ IPPROTO_RAW = 255, /* Raw IP packets */
-+#define IPPROTO_RAW IPPROTO_RAW
-+ IPPROTO_MAX
-+};
-+#endif
-+
-+#if __UAPI_DEF_IN_ADDR
-+/* Internet address. */
-+struct in_addr {
-+ __be32 s_addr;
-+};
-+#endif
-+
-+#define IP_TOS 1
-+#define IP_TTL 2
-+#define IP_HDRINCL 3
-+#define IP_OPTIONS 4
-+#define IP_ROUTER_ALERT 5
-+#define IP_RECVOPTS 6
-+#define IP_RETOPTS 7
-+#define IP_PKTINFO 8
-+#define IP_PKTOPTIONS 9
-+#define IP_MTU_DISCOVER 10
-+#define IP_RECVERR 11
-+#define IP_RECVTTL 12
-+#define IP_RECVTOS 13
-+#define IP_MTU 14
-+#define IP_FREEBIND 15
-+#define IP_IPSEC_POLICY 16
-+#define IP_XFRM_POLICY 17
-+#define IP_PASSSEC 18
-+#define IP_TRANSPARENT 19
-+
-+/* BSD compatibility */
-+#define IP_RECVRETOPTS IP_RETOPTS
-+
-+/* TProxy original addresses */
-+#define IP_ORIGDSTADDR 20
-+#define IP_RECVORIGDSTADDR IP_ORIGDSTADDR
-+
-+#define IP_MINTTL 21
-+#define IP_NODEFRAG 22
-+#define IP_CHECKSUM 23
-+#define IP_BIND_ADDRESS_NO_PORT 24
-+
-+/* IP_MTU_DISCOVER values */
-+#define IP_PMTUDISC_DONT 0 /* Never send DF frames */
-+#define IP_PMTUDISC_WANT 1 /* Use per route hints */
-+#define IP_PMTUDISC_DO 2 /* Always DF */
-+#define IP_PMTUDISC_PROBE 3 /* Ignore dst pmtu */
-+/* Always use interface mtu (ignores dst pmtu) but don't set DF flag.
-+ * Also incoming ICMP frag_needed notifications will be ignored on
-+ * this socket to prevent accepting spoofed ones.
-+ */
-+#define IP_PMTUDISC_INTERFACE 4
-+/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get
-+ * fragmented if they exeed the interface mtu
-+ */
-+#define IP_PMTUDISC_OMIT 5
-+
-+#define IP_MULTICAST_IF 32
-+#define IP_MULTICAST_TTL 33
-+#define IP_MULTICAST_LOOP 34
-+#define IP_ADD_MEMBERSHIP 35
-+#define IP_DROP_MEMBERSHIP 36
-+#define IP_UNBLOCK_SOURCE 37
-+#define IP_BLOCK_SOURCE 38
-+#define IP_ADD_SOURCE_MEMBERSHIP 39
-+#define IP_DROP_SOURCE_MEMBERSHIP 40
-+#define IP_MSFILTER 41
-+#define MCAST_JOIN_GROUP 42
-+#define MCAST_BLOCK_SOURCE 43
-+#define MCAST_UNBLOCK_SOURCE 44
-+#define MCAST_LEAVE_GROUP 45
-+#define MCAST_JOIN_SOURCE_GROUP 46
-+#define MCAST_LEAVE_SOURCE_GROUP 47
-+#define MCAST_MSFILTER 48
-+#define IP_MULTICAST_ALL 49
-+#define IP_UNICAST_IF 50
-+
-+#define MCAST_EXCLUDE 0
-+#define MCAST_INCLUDE 1
-+
-+/* These need to appear somewhere around here */
-+#define IP_DEFAULT_MULTICAST_TTL 1
-+#define IP_DEFAULT_MULTICAST_LOOP 1
-+
-+/* Request struct for multicast socket ops */
-+
-+#if __UAPI_DEF_IP_MREQ
-+struct ip_mreq {
-+ struct in_addr imr_multiaddr; /* IP multicast address of group */
-+ struct in_addr imr_interface; /* local IP address of interface */
-+};
-+
-+struct ip_mreqn {
-+ struct in_addr imr_multiaddr; /* IP multicast address of group */
-+ struct in_addr imr_address; /* local IP address of interface */
-+ int imr_ifindex; /* Interface index */
-+};
-+
-+struct ip_mreq_source {
-+ __be32 imr_multiaddr;
-+ __be32 imr_interface;
-+ __be32 imr_sourceaddr;
-+};
-+
-+struct ip_msfilter {
-+ __be32 imsf_multiaddr;
-+ __be32 imsf_interface;
-+ __u32 imsf_fmode;
-+ __u32 imsf_numsrc;
-+ __be32 imsf_slist[1];
-+};
-+
-+#define IP_MSFILTER_SIZE(numsrc) \
-+ (sizeof(struct ip_msfilter) - sizeof(__u32) \
-+ + (numsrc) * sizeof(__u32))
-+
-+struct group_req {
-+ __u32 gr_interface; /* interface index */
-+ struct __kernel_sockaddr_storage gr_group; /* group address */
-+};
-+
-+struct group_source_req {
-+ __u32 gsr_interface; /* interface index */
-+ struct __kernel_sockaddr_storage gsr_group; /* group address */
-+ struct __kernel_sockaddr_storage gsr_source; /* source address */
-+};
-+
-+struct group_filter {
-+ __u32 gf_interface; /* interface index */
-+ struct __kernel_sockaddr_storage gf_group; /* multicast address */
-+ __u32 gf_fmode; /* filter mode */
-+ __u32 gf_numsrc; /* number of sources */
-+ struct __kernel_sockaddr_storage gf_slist[1]; /* interface index */
-+};
-+
-+#define GROUP_FILTER_SIZE(numsrc) \
-+ (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \
-+ + (numsrc) * sizeof(struct __kernel_sockaddr_storage))
-+#endif
-+
-+#if __UAPI_DEF_IN_PKTINFO
-+struct in_pktinfo {
-+ int ipi_ifindex;
-+ struct in_addr ipi_spec_dst;
-+ struct in_addr ipi_addr;
-+};
-+#endif
-+
-+/* Structure describing an Internet (IP) socket address. */
-+#if __UAPI_DEF_SOCKADDR_IN
-+#define __SOCK_SIZE__ 16 /* sizeof(struct sockaddr) */
-+struct sockaddr_in {
-+ __kernel_sa_family_t sin_family; /* Address family */
-+ __be16 sin_port; /* Port number */
-+ struct in_addr sin_addr; /* Internet address */
-+
-+ /* Pad to size of `struct sockaddr'. */
-+ unsigned char __pad[__SOCK_SIZE__ - sizeof(short int) -
-+ sizeof(unsigned short int) - sizeof(struct in_addr)];
-+};
-+#define sin_zero __pad /* for BSD UNIX comp. -FvK */
-+#endif
-+
-+#if __UAPI_DEF_IN_CLASS
-+/*
-+ * Definitions of the bits in an Internet address integer.
-+ * On subnets, host and network parts are found according
-+ * to the subnet mask, not these masks.
-+ */
-+#define IN_CLASSA(a) ((((long int) (a)) & 0x80000000) == 0)
-+#define IN_CLASSA_NET 0xff000000
-+#define IN_CLASSA_NSHIFT 24
-+#define IN_CLASSA_HOST (0xffffffff & ~IN_CLASSA_NET)
-+#define IN_CLASSA_MAX 128
-+
-+#define IN_CLASSB(a) ((((long int) (a)) & 0xc0000000) == 0x80000000)
-+#define IN_CLASSB_NET 0xffff0000
-+#define IN_CLASSB_NSHIFT 16
-+#define IN_CLASSB_HOST (0xffffffff & ~IN_CLASSB_NET)
-+#define IN_CLASSB_MAX 65536
-+
-+#define IN_CLASSC(a) ((((long int) (a)) & 0xe0000000) == 0xc0000000)
-+#define IN_CLASSC_NET 0xffffff00
-+#define IN_CLASSC_NSHIFT 8
-+#define IN_CLASSC_HOST (0xffffffff & ~IN_CLASSC_NET)
-+
-+#define IN_CLASSD(a) ((((long int) (a)) & 0xf0000000) == 0xe0000000)
-+#define IN_MULTICAST(a) IN_CLASSD(a)
-+#define IN_MULTICAST_NET 0xF0000000
-+
-+#define IN_EXPERIMENTAL(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-+#define IN_BADCLASS(a) IN_EXPERIMENTAL((a))
-+
-+/* Address to accept any incoming messages. */
-+#define INADDR_ANY ((unsigned long int) 0x00000000)
-+
-+/* Address to send to all hosts. */
-+#define INADDR_BROADCAST ((unsigned long int) 0xffffffff)
-+
-+/* Address indicating an error return. */
-+#define INADDR_NONE ((unsigned long int) 0xffffffff)
-+
-+/* Network number for local host loopback. */
-+#define IN_LOOPBACKNET 127
-+
-+/* Address to loopback in software to local host. */
-+#define INADDR_LOOPBACK 0x7f000001 /* 127.0.0.1 */
-+#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)
-+
-+/* Defines for Multicast INADDR */
-+#define INADDR_UNSPEC_GROUP 0xe0000000U /* 224.0.0.0 */
-+#define INADDR_ALLHOSTS_GROUP 0xe0000001U /* 224.0.0.1 */
-+#define INADDR_ALLRTRS_GROUP 0xe0000002U /* 224.0.0.2 */
-+#define INADDR_MAX_LOCAL_GROUP 0xe00000ffU /* 224.0.0.255 */
-+#endif
-+
-+/* <asm/byteorder.h> contains the htonl type stuff.. */
-+#include <asm/byteorder.h>
-+
-+
-+#endif /* _LINUX_IN_H */
---- /dev/null
-+++ b/include/linux-private/linux/in6.h
-@@ -0,0 +1,293 @@
-+/*
-+ * Types and definitions for AF_INET6
-+ * Linux INET6 implementation
-+ *
-+ * Authors:
-+ * Pedro Roque <roque@di.fc.ul.pt>
-+ *
-+ * Sources:
-+ * IPv6 Program Interfaces for BSD Systems
-+ * <draft-ietf-ipngwg-bsd-api-05.txt>
-+ *
-+ * Advanced Sockets API for IPv6
-+ * <draft-stevens-advanced-api-00.txt>
-+ *
-+ * 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.
-+ */
-+
-+#ifndef _LINUX_IN6_H
-+#define _LINUX_IN6_H
-+
-+#include <linux/types.h>
-+#include <linux/libc-compat.h>
-+
-+/*
-+ * IPv6 address structure
-+ */
-+
-+#if __UAPI_DEF_IN6_ADDR
-+struct in6_addr {
-+ union {
-+ __u8 u6_addr8[16];
-+#if __UAPI_DEF_IN6_ADDR_ALT
-+ __be16 u6_addr16[8];
-+ __be32 u6_addr32[4];
-+#endif
-+ } in6_u;
-+#define s6_addr in6_u.u6_addr8
-+#if __UAPI_DEF_IN6_ADDR_ALT
-+#define s6_addr16 in6_u.u6_addr16
-+#define s6_addr32 in6_u.u6_addr32
-+#endif
-+};
-+#endif /* __UAPI_DEF_IN6_ADDR */
-+
-+#if __UAPI_DEF_SOCKADDR_IN6
-+struct sockaddr_in6 {
-+ unsigned short int sin6_family; /* AF_INET6 */
-+ __be16 sin6_port; /* Transport layer port # */
-+ __be32 sin6_flowinfo; /* IPv6 flow information */
-+ struct in6_addr sin6_addr; /* IPv6 address */
-+ __u32 sin6_scope_id; /* scope id (new in RFC2553) */
-+};
-+#endif /* __UAPI_DEF_SOCKADDR_IN6 */
-+
-+#if __UAPI_DEF_IPV6_MREQ
-+struct ipv6_mreq {
-+ /* IPv6 multicast address of group */
-+ struct in6_addr ipv6mr_multiaddr;
-+
-+ /* local IPv6 address of interface */
-+ int ipv6mr_ifindex;
-+};
-+#endif /* __UAPI_DEF_IVP6_MREQ */
-+
-+#define ipv6mr_acaddr ipv6mr_multiaddr
-+
-+struct in6_flowlabel_req {
-+ struct in6_addr flr_dst;
-+ __be32 flr_label;
-+ __u8 flr_action;
-+ __u8 flr_share;
-+ __u16 flr_flags;
-+ __u16 flr_expires;
-+ __u16 flr_linger;
-+ __u32 __flr_pad;
-+ /* Options in format of IPV6_PKTOPTIONS */
-+};
-+
-+#define IPV6_FL_A_GET 0
-+#define IPV6_FL_A_PUT 1
-+#define IPV6_FL_A_RENEW 2
-+
-+#define IPV6_FL_F_CREATE 1
-+#define IPV6_FL_F_EXCL 2
-+#define IPV6_FL_F_REFLECT 4
-+#define IPV6_FL_F_REMOTE 8
-+
-+#define IPV6_FL_S_NONE 0
-+#define IPV6_FL_S_EXCL 1
-+#define IPV6_FL_S_PROCESS 2
-+#define IPV6_FL_S_USER 3
-+#define IPV6_FL_S_ANY 255
-+
-+
-+/*
-+ * Bitmask constant declarations to help applications select out the
-+ * flow label and priority fields.
-+ *
-+ * Note that this are in host byte order while the flowinfo field of
-+ * sockaddr_in6 is in network byte order.
-+ */
-+
-+#define IPV6_FLOWINFO_FLOWLABEL 0x000fffff
-+#define IPV6_FLOWINFO_PRIORITY 0x0ff00000
-+
-+/* These definitions are obsolete */
-+#define IPV6_PRIORITY_UNCHARACTERIZED 0x0000
-+#define IPV6_PRIORITY_FILLER 0x0100
-+#define IPV6_PRIORITY_UNATTENDED 0x0200
-+#define IPV6_PRIORITY_RESERVED1 0x0300
-+#define IPV6_PRIORITY_BULK 0x0400
-+#define IPV6_PRIORITY_RESERVED2 0x0500
-+#define IPV6_PRIORITY_INTERACTIVE 0x0600
-+#define IPV6_PRIORITY_CONTROL 0x0700
-+#define IPV6_PRIORITY_8 0x0800
-+#define IPV6_PRIORITY_9 0x0900
-+#define IPV6_PRIORITY_10 0x0a00
-+#define IPV6_PRIORITY_11 0x0b00
-+#define IPV6_PRIORITY_12 0x0c00
-+#define IPV6_PRIORITY_13 0x0d00
-+#define IPV6_PRIORITY_14 0x0e00
-+#define IPV6_PRIORITY_15 0x0f00
-+
-+/*
-+ * IPV6 extension headers
-+ */
-+#if __UAPI_DEF_IPPROTO_V6
-+#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */
-+#define IPPROTO_ROUTING 43 /* IPv6 routing header */
-+#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */
-+#define IPPROTO_ICMPV6 58 /* ICMPv6 */
-+#define IPPROTO_NONE 59 /* IPv6 no next header */
-+#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */
-+#define IPPROTO_MH 135 /* IPv6 mobility header */
-+#endif /* __UAPI_DEF_IPPROTO_V6 */
-+
-+/*
-+ * IPv6 TLV options.
-+ */
-+#define IPV6_TLV_PAD1 0
-+#define IPV6_TLV_PADN 1
-+#define IPV6_TLV_ROUTERALERT 5
-+#define IPV6_TLV_JUMBO 194
-+#define IPV6_TLV_HAO 201 /* home address option */
-+
-+/*
-+ * IPV6 socket options
-+ */
-+#if __UAPI_DEF_IPV6_OPTIONS
-+#define IPV6_ADDRFORM 1
-+#define IPV6_2292PKTINFO 2
-+#define IPV6_2292HOPOPTS 3
-+#define IPV6_2292DSTOPTS 4
-+#define IPV6_2292RTHDR 5
-+#define IPV6_2292PKTOPTIONS 6
-+#define IPV6_CHECKSUM 7
-+#define IPV6_2292HOPLIMIT 8
-+#define IPV6_NEXTHOP 9
-+#define IPV6_AUTHHDR 10 /* obsolete */
-+#define IPV6_FLOWINFO 11
-+
-+#define IPV6_UNICAST_HOPS 16
-+#define IPV6_MULTICAST_IF 17
-+#define IPV6_MULTICAST_HOPS 18
-+#define IPV6_MULTICAST_LOOP 19
-+#define IPV6_ADD_MEMBERSHIP 20
-+#define IPV6_DROP_MEMBERSHIP 21
-+#define IPV6_ROUTER_ALERT 22
-+#define IPV6_MTU_DISCOVER 23
-+#define IPV6_MTU 24
-+#define IPV6_RECVERR 25
-+#define IPV6_V6ONLY 26
-+#define IPV6_JOIN_ANYCAST 27
-+#define IPV6_LEAVE_ANYCAST 28
-+
-+/* IPV6_MTU_DISCOVER values */
-+#define IPV6_PMTUDISC_DONT 0
-+#define IPV6_PMTUDISC_WANT 1
-+#define IPV6_PMTUDISC_DO 2
-+#define IPV6_PMTUDISC_PROBE 3
-+/* same as IPV6_PMTUDISC_PROBE, provided for symetry with IPv4
-+ * also see comments on IP_PMTUDISC_INTERFACE
-+ */
-+#define IPV6_PMTUDISC_INTERFACE 4
-+/* weaker version of IPV6_PMTUDISC_INTERFACE, which allows packets to
-+ * get fragmented if they exceed the interface mtu
-+ */
-+#define IPV6_PMTUDISC_OMIT 5
-+
-+/* Flowlabel */
-+#define IPV6_FLOWLABEL_MGR 32
-+#define IPV6_FLOWINFO_SEND 33
-+
-+#define IPV6_IPSEC_POLICY 34
-+#define IPV6_XFRM_POLICY 35
-+#endif
-+
-+/*
-+ * Multicast:
-+ * Following socket options are shared between IPv4 and IPv6.
-+ *
-+ * MCAST_JOIN_GROUP 42
-+ * MCAST_BLOCK_SOURCE 43
-+ * MCAST_UNBLOCK_SOURCE 44
-+ * MCAST_LEAVE_GROUP 45
-+ * MCAST_JOIN_SOURCE_GROUP 46
-+ * MCAST_LEAVE_SOURCE_GROUP 47
-+ * MCAST_MSFILTER 48
-+ */
-+
-+/*
-+ * Advanced API (RFC3542) (1)
-+ *
-+ * Note: IPV6_RECVRTHDRDSTOPTS does not exist. see net/ipv6/datagram.c.
-+ */
-+
-+#define IPV6_RECVPKTINFO 49
-+#define IPV6_PKTINFO 50
-+#define IPV6_RECVHOPLIMIT 51
-+#define IPV6_HOPLIMIT 52
-+#define IPV6_RECVHOPOPTS 53
-+#define IPV6_HOPOPTS 54
-+#define IPV6_RTHDRDSTOPTS 55
-+#define IPV6_RECVRTHDR 56
-+#define IPV6_RTHDR 57
-+#define IPV6_RECVDSTOPTS 58
-+#define IPV6_DSTOPTS 59
-+#define IPV6_RECVPATHMTU 60
-+#define IPV6_PATHMTU 61
-+#define IPV6_DONTFRAG 62
-+#if 0 /* not yet */
-+#define IPV6_USE_MIN_MTU 63
-+#endif
-+
-+/*
-+ * Netfilter (1)
-+ *
-+ * Following socket options are used in ip6_tables;
-+ * see include/linux/netfilter_ipv6/ip6_tables.h.
-+ *
-+ * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64
-+ * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65
-+ */
-+
-+/*
-+ * Advanced API (RFC3542) (2)
-+ */
-+#define IPV6_RECVTCLASS 66
-+#define IPV6_TCLASS 67
-+
-+/*
-+ * Netfilter (2)
-+ *
-+ * Following socket options are used in ip6_tables;
-+ * see include/linux/netfilter_ipv6/ip6_tables.h.
-+ *
-+ * IP6T_SO_GET_REVISION_MATCH 68
-+ * IP6T_SO_GET_REVISION_TARGET 69
-+ * IP6T_SO_ORIGINAL_DST 80
-+ */
-+
-+#define IPV6_AUTOFLOWLABEL 70
-+/* RFC5014: Source address selection */
-+#define IPV6_ADDR_PREFERENCES 72
-+
-+#define IPV6_PREFER_SRC_TMP 0x0001
-+#define IPV6_PREFER_SRC_PUBLIC 0x0002
-+#define IPV6_PREFER_SRC_PUBTMP_DEFAULT 0x0100
-+#define IPV6_PREFER_SRC_COA 0x0004
-+#define IPV6_PREFER_SRC_HOME 0x0400
-+#define IPV6_PREFER_SRC_CGA 0x0008
-+#define IPV6_PREFER_SRC_NONCGA 0x0800
-+
-+/* RFC5082: Generalized Ttl Security Mechanism */
-+#define IPV6_MINHOPCOUNT 73
-+
-+#define IPV6_ORIGDSTADDR 74
-+#define IPV6_RECVORIGDSTADDR IPV6_ORIGDSTADDR
-+#define IPV6_TRANSPARENT 75
-+#define IPV6_UNICAST_IF 76
-+
-+/*
-+ * Multicast Routing:
-+ * see include/uapi/linux/mroute6.h.
-+ *
-+ * MRT6_BASE 200
-+ * ...
-+ * MRT6_MAX
-+ */
-+#endif /* _LINUX_IN6_H */
---- /dev/null
-+++ b/include/linux-private/linux/libc-compat.h
-@@ -0,0 +1,143 @@
-+/*
-+ * Compatibility interface for userspace libc header coordination:
-+ *
-+ * Define compatibility macros that are used to control the inclusion or
-+ * exclusion of UAPI structures and definitions in coordination with another
-+ * userspace C library.
-+ *
-+ * This header is intended to solve the problem of UAPI definitions that
-+ * conflict with userspace definitions. If a UAPI header has such conflicting
-+ * definitions then the solution is as follows:
-+ *
-+ * * Synchronize the UAPI header and the libc headers so either one can be
-+ * used and such that the ABI is preserved. If this is not possible then
-+ * no simple compatibility interface exists (you need to write translating
-+ * wrappers and rename things) and you can't use this interface.
-+ *
-+ * Then follow this process:
-+ *
-+ * (a) Include libc-compat.h in the UAPI header.
-+ * e.g. #include <linux/libc-compat.h>
-+ * This include must be as early as possible.
-+ *
-+ * (b) In libc-compat.h add enough code to detect that the comflicting
-+ * userspace libc header has been included first.
-+ *
-+ * (c) If the userspace libc header has been included first define a set of
-+ * guard macros of the form __UAPI_DEF_FOO and set their values to 1, else
-+ * set their values to 0.
-+ *
-+ * (d) Back in the UAPI header with the conflicting definitions, guard the
-+ * definitions with:
-+ * #if __UAPI_DEF_FOO
-+ * ...
-+ * #endif
-+ *
-+ * This fixes the situation where the linux headers are included *after* the
-+ * libc headers. To fix the problem with the inclusion in the other order the
-+ * userspace libc headers must be fixed like this:
-+ *
-+ * * For all definitions that conflict with kernel definitions wrap those
-+ * defines in the following:
-+ * #if !__UAPI_DEF_FOO
-+ * ...
-+ * #endif
-+ *
-+ * This prevents the redefinition of a construct already defined by the kernel.
-+ */
-+#ifndef _LIBC_COMPAT_H
-+#define _LIBC_COMPAT_H
-+
-+/* We have included glibc headers... */
-+#if defined(__GLIBC__)
-+
-+/* Coordinate with glibc netinet/in.h header. */
-+#if defined(_NETINET_IN_H)
-+
-+/* GLIBC headers included first so don't define anything
-+ * that would already be defined. */
-+#define __UAPI_DEF_IN_ADDR 0
-+#define __UAPI_DEF_IN_IPPROTO 0
-+#define __UAPI_DEF_IN_PKTINFO 0
-+#define __UAPI_DEF_IP_MREQ 0
-+#define __UAPI_DEF_SOCKADDR_IN 0
-+#define __UAPI_DEF_IN_CLASS 0
-+
-+#define __UAPI_DEF_IN6_ADDR 0
-+/* The exception is the in6_addr macros which must be defined
-+ * if the glibc code didn't define them. This guard matches
-+ * the guard in glibc/inet/netinet/in.h which defines the
-+ * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
-+#if defined(__USE_MISC) || defined (__USE_GNU)
-+#define __UAPI_DEF_IN6_ADDR_ALT 0
-+#else
-+#define __UAPI_DEF_IN6_ADDR_ALT 1
-+#endif
-+#define __UAPI_DEF_SOCKADDR_IN6 0
-+#define __UAPI_DEF_IPV6_MREQ 0
-+#define __UAPI_DEF_IPPROTO_V6 0
-+#define __UAPI_DEF_IPV6_OPTIONS 0
-+#define __UAPI_DEF_IN6_PKTINFO 0
-+#define __UAPI_DEF_IP6_MTUINFO 0
-+
-+#else
-+
-+/* Linux headers included first, and we must define everything
-+ * we need. The expectation is that glibc will check the
-+ * __UAPI_DEF_* defines and adjust appropriately. */
-+#define __UAPI_DEF_IN_ADDR 1
-+#define __UAPI_DEF_IN_IPPROTO 1
-+#define __UAPI_DEF_IN_PKTINFO 1
-+#define __UAPI_DEF_IP_MREQ 1
-+#define __UAPI_DEF_SOCKADDR_IN 1
-+#define __UAPI_DEF_IN_CLASS 1
-+
-+#define __UAPI_DEF_IN6_ADDR 1
-+/* We unconditionally define the in6_addr macros and glibc must
-+ * coordinate. */
-+#define __UAPI_DEF_IN6_ADDR_ALT 1
-+#define __UAPI_DEF_SOCKADDR_IN6 1
-+#define __UAPI_DEF_IPV6_MREQ 1
-+#define __UAPI_DEF_IPPROTO_V6 1
-+#define __UAPI_DEF_IPV6_OPTIONS 1
-+#define __UAPI_DEF_IN6_PKTINFO 1
-+#define __UAPI_DEF_IP6_MTUINFO 1
-+
-+#endif /* _NETINET_IN_H */
-+
-+/* Definitions for xattr.h */
-+#if defined(_SYS_XATTR_H)
-+#define __UAPI_DEF_XATTR 0
-+#else
-+#define __UAPI_DEF_XATTR 1
-+#endif
-+
-+/* If we did not see any headers from any supported C libraries,
-+ * or we are being included in the kernel, then define everything
-+ * that we need. */
-+#else /* !defined(__GLIBC__) */
-+
-+/* Definitions for in.h */
-+#define __UAPI_DEF_IN_ADDR 1
-+#define __UAPI_DEF_IN_IPPROTO 1
-+#define __UAPI_DEF_IN_PKTINFO 1
-+#define __UAPI_DEF_IP_MREQ 1
-+#define __UAPI_DEF_SOCKADDR_IN 1
-+#define __UAPI_DEF_IN_CLASS 1
-+
-+/* Definitions for in6.h */
-+#define __UAPI_DEF_IN6_ADDR 1
-+#define __UAPI_DEF_IN6_ADDR_ALT 1
-+#define __UAPI_DEF_SOCKADDR_IN6 1
-+#define __UAPI_DEF_IPV6_MREQ 1
-+#define __UAPI_DEF_IPPROTO_V6 1
-+#define __UAPI_DEF_IPV6_OPTIONS 1
-+#define __UAPI_DEF_IN6_PKTINFO 1
-+#define __UAPI_DEF_IP6_MTUINFO 1
-+
-+/* Definitions for xattr.h */
-+#define __UAPI_DEF_XATTR 1
-+
-+#endif /* __GLIBC__ */
-+
-+#endif /* _LIBC_COMPAT_H */
diff --git a/package/libnl/0003-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
similarity index 100%
rename from package/libnl/0003-Add-musl-workaround-to-the-libc-compat.h-copy.patch
rename to package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
diff --git a/package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch b/package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch
new file mode 100644
index 0000000..f715bb8
--- /dev/null
+++ b/package/libnl/0003-Revert-build-enable-building-cli-during-tests.patch
@@ -0,0 +1,115 @@
+From 68f8393bd356a3d0598cf77e1044b7e8b98aa4d8 Mon Sep 17 00:00:00 2001
+Message-Id: <68f8393bd356a3d0598cf77e1044b7e8b98aa4d8.1493920165.git.baruch@tkos.co.il>
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 4 May 2017 15:56:14 +0300
+Subject: [PATCH] Revert "build: enable building cli during tests"
+
+This reverts commit 3cb28534d34392ceec4adead0cfa97039796ccb7.
+
+Contrary to what 3cb28534d commit log claims, the cli programs depend on
+dynamic libraries support of the toolchain. Enabling cli programs
+unconditionally breaks static build as follows:
+
+In file included from lib/cli/cls/basic.c:12:0:
+./include/netlink/cli/utils.h:25:19: fatal error: dlfcn.h: No such file or directory
+compilation terminated.
+Makefile:3666: recipe for target 'lib/cli/cls/lib_cli_cls_basic_la-basic.lo' failed
+make[1]: *** [lib/cli/cls/lib_cli_cls_basic_la-basic.lo] Error 1
+
+Revert that commit to restore the ability of static only build of libnl, and
+its dependencies.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/thom311/libnl/pull/141
+
+ Makefile.am | 21 ++++++---------------
+ 1 file changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1b95a559304f..279548394650 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,8 +3,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+ lib_LTLIBRARIES =
+-noinst_LTLIBRARIES =
+-check_LTLIBRARIES =
+
+ check_PROGRAMS =
+ check_programs =
+@@ -500,6 +498,8 @@ EXTRA_lib_libnl_xfrm_3_la_DEPENDENCIES = \
+ lib_libnl_xfrm_3_la_LIBADD = \
+ lib/libnl-3.la
+
++if ENABLE_CLI
++
+ lib_cli_ltlibraries_cls = \
+ lib/cli/cls/basic.la \
+ lib/cli/cls/cgroup.la
+@@ -513,15 +513,11 @@ lib_cli_ltlibraries_qdisc = \
+ lib/cli/qdisc/pfifo.la \
+ lib/cli/qdisc/plug.la
+
+-if ENABLE_CLI
+ pkglib_clsdir = $(pkglibdir)/cli/cls
+ pkglib_qdiscdir = $(pkglibdir)/cli/qdisc
+ pkglib_cls_LTLIBRARIES = $(lib_cli_ltlibraries_cls)
+ pkglib_qdisc_LTLIBRARIES = $(lib_cli_ltlibraries_qdisc)
+-else
+-noinst_LTLIBRARIES += \
+- $(lib_cli_ltlibraries_cls) \
+- $(lib_cli_ltlibraries_qdisc)
++
+ endif
+
+ lib_cli_ldflags = \
+@@ -550,13 +546,8 @@ lib_cli_qdisc_plug_la_LDFLAGS = $(lib_cli_ldflags)
+
+ ###############################################################################
+
+-src_lib_ldflags =
+-
+ if ENABLE_CLI
+ lib_LTLIBRARIES += src/lib/libnl-cli-3.la
+-src_lib_ldflags += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-else
+-check_LTLIBRARIES += src/lib/libnl-cli-3.la
+ endif
+
+ src_lib_libnl_cli_3_la_SOURCES = \
+@@ -583,7 +574,7 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \
+ -I$(srcdir)/include \
+ -I$(builddir)/include
+ src_lib_libnl_cli_3_la_LDFLAGS = \
+- $(src_lib_ldflags) \
++ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -Wl,--version-script=$(srcdir)/libnl-cli-3.sym
+ src_lib_libnl_cli_3_la_LIBADD = \
+ lib/libnl-3.la \
+@@ -668,8 +659,6 @@ else
+ noinst_PROGRAMS += $(cli_programs)
+ endif
+ endif
+-else
+-check_PROGRAMS += $(cli_programs)
+ endif
+
+ src_genl_ctrl_list_CPPFLAGS = $(src_cppflags)
+@@ -847,10 +836,12 @@ tests_test_complex_HTB_with_hash_filters_LDADD = $(tests_ldadd)
+ tests_test_u32_filter_with_actions_CPPFLAGS = $(tests_cppflags)
+ tests_test_u32_filter_with_actions_LDADD = $(tests_ldadd)
+
++if ENABLE_CLI
+ check_PROGRAMS += \
+ tests/test-cache-mngr \
+ tests/test-genl \
+ tests/test-nf-cache-mngr
++endif
+
+ tests_cli_ldadd = \
+ $(tests_ldadd) \
+--
+2.11.0
+
diff --git a/package/libnl/0004-lib-escape-usage-of-strerror_l-if-it-doesn-t-exist-i.patch b/package/libnl/0004-lib-escape-usage-of-strerror_l-if-it-doesn-t-exist-i.patch
deleted file mode 100644
index 6a9c354..0000000
--- a/package/libnl/0004-lib-escape-usage-of-strerror_l-if-it-doesn-t-exist-i.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From e15966ac7f3b43df2acf869f98089762807d0568 Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
-Date: Fri, 10 Mar 2017 17:44:22 +0300
-Subject: [PATCH] lib: escape usage of strerror_l() if it doesn't exist in libc
-
-uClibc doesn't implement strerror_l() and thus libnl starting from
-3.2.29 couldn't be compiled with it any longer.
-
-To work-around that problem we'll just do a check on strerror_l()
-availability during configuration and if it's not there just fall back
-to locale-less strerror().
-
-See-also: 6c2d111177e91184073c44f83d4a6182aaba06d7
-
-http://lists.infradead.org/pipermail/libnl/2017-March/002301.html
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
-Signed-off-by: Thomas Haller <thaller@redhat.com>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: upstream commit e15966ac7f3b43df
-
- configure.ac | 2 ++
- lib/utils.c | 8 +++++++-
- src/lib/utils.c | 6 ++++++
- 3 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 68b285e5b15c..2739b997ee3a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,6 +121,8 @@ fi
-
- AC_CONFIG_SUBDIRS([doc])
-
-+AC_CHECK_FUNCS([strerror_l])
-+
- AC_CONFIG_FILES([
- Makefile
- libnl-3.0.pc
-diff --git a/lib/utils.c b/lib/utils.c
-index fb350d13fd2f..06273c5b291e 100644
---- a/lib/utils.c
-+++ b/lib/utils.c
-@@ -30,7 +30,9 @@
- #include <netlink/utils.h>
- #include <linux/socket.h>
- #include <stdlib.h> /* exit() */
-+#ifdef HAVE_STRERROR_L
- #include <locale.h>
-+#endif
-
- /**
- * Global variable indicating the desired level of debugging output.
-@@ -123,9 +125,10 @@ int __nl_read_num_str_file(const char *path, int (*cb)(long, const char *))
-
- const char *nl_strerror_l(int err)
- {
-+ const char *buf;
-+#ifdef HAVE_STRERROR_L
- int errno_save = errno;
- locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
-- const char *buf;
-
- if (loc == (locale_t)0) {
- if (errno == ENOENT)
-@@ -140,6 +143,9 @@ const char *nl_strerror_l(int err)
- }
-
- errno = errno_save;
-+#else
-+ buf = strerror(err);
-+#endif
- return buf;
- }
- /** @endcond */
-diff --git a/src/lib/utils.c b/src/lib/utils.c
-index 5878f279c364..feb1d4ef4056 100644
---- a/src/lib/utils.c
-+++ b/src/lib/utils.c
-@@ -81,6 +81,7 @@ void nl_cli_fatal(int err, const char *fmt, ...)
- fprintf(stderr, "\n");
- } else {
- char *buf;
-+#ifdef HAVE_STRERROR_L
- locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
- if (loc == (locale_t)0) {
- if (errno == ENOENT)
-@@ -91,9 +92,14 @@ void nl_cli_fatal(int err, const char *fmt, ...)
- }
- if (loc != (locale_t)0)
- buf = strerror_l(err, loc);
-+#else
-+ buf = strerror(err);
-+#endif
- fprintf(stderr, "%s\n", buf);
-+#ifdef HAVE_STRERROR_L
- if (loc != (locale_t)0)
- freelocale(loc);
-+#endif
- }
-
- exit(abs(err));
---
-2.11.0
-
diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash
index f357927..ae502c2 100644
--- a/package/libnl/libnl.hash
+++ b/package/libnl/libnl.hash
@@ -1,3 +1,2 @@
-# From https://github.com/thom311/libnl/releases/download/libnl3_2_29/libnl-3.2.29.tar.gz.sha256sum
-sha256 0beb593dc6abfffa18a5c787b27884979c1b7e7f1fd468c801e3cc938a685922 libnl-3.2.29.tar.gz
-sha256 b7bb929194eefc56c786a7e1ae5176b54713f9013ccec63760f232742ae80361 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch
+# From https://github.com/thom311/libnl/releases/download/libnl3_3_0/libnl-3.3.0.tar.gz.sha256sum
+sha256 705468b5ae4cd1eb099d2d1c476d6a3abe519bc2810becf12fb1e32de1e074e4 libnl-3.3.0.tar.gz
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 8226f87..e1a37aa 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -4,17 +4,15 @@
#
################################################################################
-LIBNL_VERSION = 3.2.29
+LIBNL_VERSION = 3.3.0
LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION))
LIBNL_LICENSE = LGPL-2.1+
LIBNL_LICENSE_FILES = COPYING
LIBNL_INSTALL_STAGING = YES
LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf
-# Patching configure.ac
+# Patching Makefile.am
LIBNL_AUTORECONF = YES
-LIBNL_PATCH = https://github.com/thom311/libnl/commit/3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch
-
ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
LIBNL_CONF_OPTS += --enable-cli
else
^ permalink raw reply related
* [Buildroot] [PATCH] python-tornado: bump to version 4.5.1
From: Peter Korsgaard @ 2017-05-05 19:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1493992902-3917-1-git-send-email-yegorslists@googlemail.com>
>>>>> "yegorslists" == yegorslists <yegorslists@googlemail.com> writes:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] python-tornado: bump to version 4.5.1
From: Peter Korsgaard @ 2017-05-05 19:15 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=0cad2f2c6f2882b30a424edfacbc3e9f02c44e1c
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-tornado/python-tornado.hash | 4 ++--
package/python-tornado/python-tornado.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash
index ee4080f..662db6f 100644
--- a/package/python-tornado/python-tornado.hash
+++ b/package/python-tornado/python-tornado.hash
@@ -1,3 +1,3 @@
# md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed
-md5 b4816ea209118667ffc52ce9ff06ac85 tornado-4.4.2.tar.gz
-sha256 2898f992f898cd41eeb8d53b6df75495f2f423b6672890aadaf196ea1448edcc tornado-4.4.2.tar.gz
+md5 838687d20923360af5ab59f101e9e02e tornado-4.5.1.tar.gz
+sha256 db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd tornado-4.5.1.tar.gz
diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk
index e512e60..6e61675 100644
--- a/package/python-tornado/python-tornado.mk
+++ b/package/python-tornado/python-tornado.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_TORNADO_VERSION = 4.4.2
+PYTHON_TORNADO_VERSION = 4.5.1
PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
-PYTHON_TORNADO_SITE = https://pypi.python.org/packages/1e/7c/ea047f7bbd1ff22a7f69fe55e7561040e3e54d6f31da6267ef9748321f98
+PYTHON_TORNADO_SITE = https://pypi.python.org/packages/df/42/a180ee540e12e2ec1007ac82a42b09dd92e5461e09c98bf465e98646d187
PYTHON_TORNADO_LICENSE = Apache-2.0
PYTHON_TORNADO_SETUP_TYPE = setuptools
^ permalink raw reply related
* [Buildroot] [PATCH] package/kyua: fix unmet dependencies
From: Yann E. MORIN @ 2017-05-05 19:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505190826.11902-1-yann.morin.1998@free.fr>
S?bastien, All,
On 2017-05-05 21:08 +0200, Yann E. MORIN spake thusly:
> lutok is a lua module, so it depends on ! static libs. However, the
> dependency is implicit, being done because the lua modules are sourced
> globally under an if-block, and thus it is not easy to find that
> dependency.
>
> Propagate that dependency to kyua, which was missing it (because it is
> not a lua module, so was missing the dependency).
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
You can try on current master (cfe6112780):
$ make KCONFIG_SEED=0x6DC29DCB randconfig
warning: (BR2_PACKAGE_KYUA) selects BR2_PACKAGE_LUTOK which has
unmet direct dependencies (BR2_PACKAGE_HAS_LUAINTERPRETER &&
!BR2_STATIC_LIBS && BR2_INSTALL_LIBSTDCPP && !BR2_PACKAGE_LUAJIT)
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] package/kyua: fix unmet dependencies
From: Yann E. MORIN @ 2017-05-05 19:08 UTC (permalink / raw)
To: buildroot
lutok is a lua module, so it depends on ! static libs. However, the
dependency is implicit, being done because the lua modules are sourced
globally under an if-block, and thus it is not easy to find that
dependency.
Propagate that dependency to kyua, which was missing it (because it is
not a lua module, so was missing the dependency).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
---
package/kyua/Config.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/kyua/Config.in b/package/kyua/Config.in
index 4f887b0e0a..6444b8c9e0 100644
--- a/package/kyua/Config.in
+++ b/package/kyua/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_KYUA
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_HAS_LUAINTERPRETER # lutok
depends on !BR2_PACKAGE_LUAJIT # lutok
+ depends on !BR2_STATIC_LIBS # lutok
depends on BR2_USE_MMU # atf
select BR2_PACKAGE_ATF
select BR2_PACKAGE_LUTOK
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH] rpi-wifi-firmware: new package
From: Peter Korsgaard @ 2017-05-05 18:37 UTC (permalink / raw)
To: buildroot
Add firmware (NVRAM data) for the Raspberry Pi 3 and Zero W wifi module.
Notice that linux-firmware provides the main firmware
(brcmfmac43430-sdio.bin), but the module also needs board specific
configuration (NVRAM) data.
For the rpi, this data is available in the RPI firmware-nonfree git repo.
As this repo contains a lot of unrelated data (~70MB), simply download the
single NVRAM file instead of cloning the entire repo.
A similar approach is used by openwrt and opensuse:
https://dev.openwrt.org/browser/trunk/package/firmware/brcmfmac43430-firmware/Makefile?rev=49139
https://build.opensuse.org/package/view_file/hardware/bcm43xx-firmware/bcm43xx-firmware.spec?rev=b1628448b36c85abc9215eab4785ef29
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/Config.in | 1 +
package/rpi-wifi-firmware/Config.in | 10 ++++++++++
package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 ++
package/rpi-wifi-firmware/rpi-wifi-firmware.mk | 22 ++++++++++++++++++++++
4 files changed, 35 insertions(+)
create mode 100644 package/rpi-wifi-firmware/Config.in
create mode 100644 package/rpi-wifi-firmware/rpi-wifi-firmware.hash
create mode 100644 package/rpi-wifi-firmware/rpi-wifi-firmware.mk
diff --git a/package/Config.in b/package/Config.in
index 1af815086..d57813c5c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -348,6 +348,7 @@ menu "Firmware"
source "package/linux-firmware/Config.in"
source "package/rpi-bt-firmware/Config.in"
source "package/rpi-firmware/Config.in"
+ source "package/rpi-wifi-firmware/Config.in"
source "package/sunxi-boards/Config.in"
source "package/ts4900-fpga/Config.in"
source "package/ux500-firmware/Config.in"
diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in
new file mode 100644
index 000000000..2c87c7584
--- /dev/null
+++ b/package/rpi-wifi-firmware/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_RPI_WIFI_FIRMWARE
+ bool "rpi-wifi-firmware"
+ depends on BR2_arm || BR2_aarch64
+ select BR2_PACKAGE_LINUX_FIRMWARE
+ select BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX # runtime
+ help
+ Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module
+ NVRAM data.
+
+ https://github.com/RPi-Distro/firmware-nonfree/
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
new file mode 100644
index 000000000..c20506536
--- /dev/null
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 872fde4f9942d9aba805880d6eaddfe050305626fd58ad955bfe77c04f6b75a5 brcmfmac43430-sdio.txt
diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
new file mode 100644
index 000000000..e90864fae
--- /dev/null
+++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# rpi-wifi-firmware
+#
+################################################################################
+
+RPI_WIFI_FIRMWARE_VERSION = 54bab3d6a6d43239c71d26464e6e10e5067ffea7
+# brcmfmac43430-sdio.bin comes from linux-firmware
+RPI_WIFI_FIRMWARE_SOURCE = brcmfmac43430-sdio.txt
+# git repo contains a lot of unrelated files
+RPI_WIFI_FIRMWARE_SITE = https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(RPI_WIFI_FIRMWARE_VERSION)/brcm80211/brcm
+
+define RPI_WIFI_FIRMWARE_EXTRACT_CMDS
+ cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
+endef
+
+define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0644 $(@D)/$(RPI_WIFI_FIRMWARE_SOURCE) \
+ $(TARGET_DIR)/lib/firmware/brcm/$(RPI_WIFI_FIRMWARE_SOURCE)
+endef
+
+$(eval $(generic-package))
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH v2] package: protobuf, python-protobuf: bump to v3.3.0
From: Mario Rugiero @ 2017-05-05 18:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505202049.643d7041@free-electrons.com>
2017-05-05 15:20 GMT-03:00 Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>:
> Hello,
>
> On Fri, 5 May 2017 14:24:00 -0300, Mario Rugiero wrote:
>
>> I fixed that particular issue in my local copy, but fails because
>> Atomic32 is not supported in that toolchain.
>> Do you know if there is any similar toolchain with such support?
>> Otherwise, how should I fix that?
>
> What error do you have exactly?
/bin/sh ../libtool --tag=CXX --mode=compile
/home/mrugiero/workspace/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-g++
-DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -pthread -DHAVE_PTHREAD=1 -Wall
-Wno-sign-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -Os -c -o google/protobuf/dynamic_message.lo
goo
gle/protobuf/dynamic_message.cc
libtool: compile:
/home/mrugiero/workspace/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-g++
-DHAVE_CONFIG_H -I. -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -pthread -DHAVE_PTHREAD=1 -Wall
-Wno-sign-compare -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -Os -c google/protobuf/dynamic_message.cc
-fPIC -DPIC -o google/protobuf/.libs/dy
namic_message.o
In file included from google/protobuf/dynamic_message.cc:82:
./google/protobuf/map_field.h: In member function 'void
google::protobuf::internal::MapField<Derived, Key, Value,
kKeyFieldType, kValueFieldType,
default_enum_value>::Swap(google::protobuf::internal::MapField<Derived,
Key, Value, kKeyFieldType, kValueFieldType, default_enum_value>*)':
./google/protobuf/map_field.h:139: error: object missing in reference
to 'google::protobuf::internal::MapFieldBase::repeated_field_'
./google/protobuf/map_field_inl.h:255: error: from this location
./google/protobuf/map_field.h:143: error: object missing in reference
to 'google::protobuf::internal::MapFieldBase::state_'
./google/protobuf/map_field_inl.h:257: error: from this location
>
> Something like an undefined reference to some __atomic_*() function? If
> so, then make sure you link with -latomic.
>
> Best regards,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH v2] package: protobuf, python-protobuf: bump to v3.3.0
From: Thomas Petazzoni @ 2017-05-05 18:20 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAKKQwLQWLytghCPeEWWjMsLw2vrcL-DumzWcevz2Dz+uwE0HGQ@mail.gmail.com>
Hello,
On Fri, 5 May 2017 14:24:00 -0300, Mario Rugiero wrote:
> I fixed that particular issue in my local copy, but fails because
> Atomic32 is not supported in that toolchain.
> Do you know if there is any similar toolchain with such support?
> Otherwise, how should I fix that?
What error do you have exactly?
Something like an undefined reference to some __atomic_*() function? If
so, then make sure you link with -latomic.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply
* [Buildroot] [PATCH v2] package: protobuf, python-protobuf: bump to v3.3.0
From: Mario Rugiero @ 2017-05-05 17:24 UTC (permalink / raw)
To: buildroot
In-Reply-To: <CAKKQwLSKh5LijFRDNDXmocqgxtgSk1Gt_8vh8wnFDbCPbtdZJg@mail.gmail.com>
>> You can reproduce this by using the following configuration:
>>
>> BR2_arm=y
>> BR2_TOOLCHAIN_EXTERNAL=y
>> BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
>> BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
>> BR2_TOOLCHAIN_EXTERNAL_URL="http://sources.buildroot.net/arm-2009q1-203-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
>> BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-none-linux-gnueabi"
>> BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
>> BR2_TOOLCHAIN_EXTERNAL_CXX=y
>> BR2_INIT_NONE=y
>> # BR2_PACKAGE_BUSYBOX is not set
>> BR2_PACKAGE_PROTOBUF=y
>> # BR2_TARGET_ROOTFS_TAR is not set
>>
>> Best regards,
>>
>> Thomas Petazzoni
>> --
>> Thomas Petazzoni, CTO, Free Electrons
>> Embedded Linux and Kernel engineering
>> http://free-electrons.com
> Thanks, I'll look into it.
I fixed that particular issue in my local copy, but fails because
Atomic32 is not supported in that toolchain.
Do you know if there is any similar toolchain with such support?
Otherwise, how should I fix that?
Regards,
Mario.
^ 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