Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
Stefan Agner
@@ -0,0 +1,61 @@
|
||||
From 358e0755c3a434d7a815519b8c10ae5d347caad0 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 16 Dec 2020 07:51:04 +0100
|
||||
Subject: [PATCH] configure.ac: fix static build with readline
|
||||
|
||||
Retrieve the dependencies of readline through pkg-config (and fallback
|
||||
to -lreadline) to avoid the following build failure:
|
||||
|
||||
/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: /nvme/rc-buildroot-test/scripts/instance-0/output-1/host/bin/../x86_64-buildroot-linux-uclibc/sysroot/usr/lib/libreadline.a(display.o): in function `cr':
|
||||
display.c:(.text+0x1ab): undefined reference to `tputs'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/8fb1341f2f5094c346456b43b4fc04996c2e1485
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://lists.01.org/hyperkitty/list/iwd@lists.01.org/thread/NFI4P52Y65T6XX7S7DGIVDMZISNQWUUC/]
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
configure.ac | 3 +++
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 3cd7eaa6..493d06cc 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -288,7 +288,7 @@ client_iwctl_SOURCES = client/main.c \
|
||||
client/network.h client/network.c \
|
||||
client/properties.h client/properties.c \
|
||||
client/wsc.c client/station.c
|
||||
-client_iwctl_LDADD = $(ell_ldadd) -lreadline
|
||||
+client_iwctl_LDADD = $(ell_ldadd) $(READLINE_LIBS)
|
||||
|
||||
if MANUAL_PAGES
|
||||
man_MANS += client/iwctl.1
|
||||
@@ -504,7 +504,7 @@ unit_test_client_SOURCES = unit/test-client.c \
|
||||
client/display.h client/display.c \
|
||||
client/network.h client/network.c \
|
||||
client/properties.h client/properties.c
|
||||
-unit_test_client_LDADD = $(ell_ldadd) -lreadline
|
||||
+unit_test_client_LDADD = $(ell_ldadd) $(READLINE_LIBS)
|
||||
endif
|
||||
|
||||
unit_test_sae_SOURCES = unit/test-sae.c \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7bd917a4..52f27ed9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -154,6 +154,9 @@ AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client],
|
||||
if (test "${enable_client}" != "no"); then
|
||||
AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes,
|
||||
AC_MSG_ERROR(readline header files are required))
|
||||
+ PKG_CHECK_MODULES(READLINE, readline, dummy=yes, READLINE_LIBS=-lreadline)
|
||||
+ AC_SUBST(READLINE_CFLAGS)
|
||||
+ AC_SUBST(READLINE_LIBS)
|
||||
fi
|
||||
AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no")
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From 377df79e83e2127a087e1aa5ba6173e195e50933 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 10 Sep 2020 07:47:14 +0200
|
||||
Subject: [PATCH] src/ap.c: fix build with uclibc
|
||||
|
||||
explicit_bzero is used in src/ap.c since commit
|
||||
d55e00b31d7bccdbb2ea1cdeb0a749df77a51e47 but src/missing.h is not
|
||||
included, as a result build with uclibc fails on:
|
||||
|
||||
/srv/storage/autobuild/run/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: src/ap.o: in function `ap_probe_req_cb':
|
||||
ap.c:(.text+0x23d8): undefined reference to `explicit_bzero'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/c7a0096a269bfc52bd8e23d453d36d5bfb61441d
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=0a6de7932a61ec82aca4f78f71dab7247c897860]
|
||||
---
|
||||
src/ap.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ap.c b/src/ap.c
|
||||
index c972cfcb..ac705c31 100644
|
||||
--- a/src/ap.c
|
||||
+++ b/src/ap.c
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "linux/nl80211.h"
|
||||
|
||||
+#include "src/missing.h"
|
||||
#include "src/iwd.h"
|
||||
#include "src/module.h"
|
||||
#include "src/scan.h"
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -4,7 +4,6 @@ config BR2_PACKAGE_IWD
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell
|
||||
depends on !BR2_STATIC_LIBS # ell
|
||||
depends on BR2_USE_WCHAR # ell
|
||||
select BR2_PACKAGE_DBUS # runtime
|
||||
select BR2_PACKAGE_ELL
|
||||
@@ -14,8 +13,8 @@ config BR2_PACKAGE_IWD
|
||||
|
||||
https://iwd.wiki.kernel.org/
|
||||
|
||||
comment "iwd needs a toolchain w/ threads, dynamic library, wchar, headers >= 4.12"
|
||||
comment "iwd needs a toolchain w/ threads, wchar, headers >= 4.12"
|
||||
depends on BR2_USE_MMU # dbus
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
|
||||
!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 e4178a105021ef1b7b7c23cbc6f8e45cbab3bb0830da588b406ff4a281e9f948 iwd-1.9.tar.gz
|
||||
sha256 c3ea43eccf27bb92d4e4482ff407cdabd2d1a1e4647d646241de87f2774e9a20 iwd-1.10-br1.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
|
||||
|
||||
@@ -4,13 +4,16 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IWD_VERSION = 1.9
|
||||
IWD_VERSION = 1.10
|
||||
IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git
|
||||
IWD_SITE_METHOD = git
|
||||
IWD_LICENSE = LGPL-2.1+
|
||||
IWD_LICENSE_FILES = COPYING
|
||||
IWD_CPE_ID_VENDOR = intel
|
||||
IWD_CPE_ID_PRODUCT = inet_wireless_daemon
|
||||
# sources from git, no configure script provided
|
||||
IWD_AUTORECONF = YES
|
||||
IWD_SELINUX_MODULES = networkmanager
|
||||
|
||||
IWD_CONF_OPTS = \
|
||||
--disable-manual-pages \
|
||||
|
||||
Reference in New Issue
Block a user