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
2021-03-04 00:50:33 +01:00
committed by GitHub
parent b77d633382
commit f358f322da
2130 changed files with 23612 additions and 21038 deletions

View File

@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_5_9
default BR2_KERNEL_HEADERS_5_10
help
Select the kernel version to get headers from.
@@ -54,13 +54,9 @@ config BR2_KERNEL_HEADERS_5_4
bool "Linux 5.4.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
config BR2_KERNEL_HEADERS_5_8
bool "Linux 5.8.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8
config BR2_KERNEL_HEADERS_5_9
bool "Linux 5.9.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9
config BR2_KERNEL_HEADERS_5_10
bool "Linux 5.10.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10
select BR2_KERNEL_HEADERS_LATEST
config BR2_KERNEL_HEADERS_VERSION
@@ -135,8 +131,12 @@ choice
If your kernel headers are more recent than the latest version
in the choice, then select the latest version.
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10
bool "5.10.x or later"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9
bool "5.9.x or later"
bool "5.9.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_9
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8
@@ -346,13 +346,12 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.4.253" if BR2_KERNEL_HEADERS_4_4
default "4.9.253" if BR2_KERNEL_HEADERS_4_9
default "4.14.217" if BR2_KERNEL_HEADERS_4_14
default "4.19.171" if BR2_KERNEL_HEADERS_4_19
default "5.4.93" if BR2_KERNEL_HEADERS_5_4
default "5.8.18" if BR2_KERNEL_HEADERS_5_8
default "5.9.16" if BR2_KERNEL_HEADERS_5_9
default "4.4.255" if BR2_KERNEL_HEADERS_4_4
default "4.9.255" if BR2_KERNEL_HEADERS_4_9
default "4.14.219" if BR2_KERNEL_HEADERS_4_14
default "4.19.173" if BR2_KERNEL_HEADERS_4_19
default "5.4.95" if BR2_KERNEL_HEADERS_5_4
default "5.10.13" if BR2_KERNEL_HEADERS_5_10
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \

View File

@@ -18,6 +18,10 @@ LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
LINUX_HEADERS_CIP = $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION)
ifneq ($(LINUX_HEADERS_OVERRIDE_SRCDIR),)
$(error LINUX_HEADERS_OVERRIDE_SRCDIR must not be set when BR2_KERNEL_HEADERS_AS_KERNEL=y)
endif
LINUX_HEADERS_OVERRIDE_SRCDIR = $(LINUX_OVERRIDE_SRCDIR)
else # ! BR2_KERNEL_HEADERS_AS_KERNEL
LINUX_HEADERS_CUSTOM_TARBALL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_TARBALL))
LINUX_HEADERS_CUSTOM_GIT = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_GIT))
@@ -34,7 +38,7 @@ ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y)
LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))
LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)))
else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y)
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_git).tar.gz
LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL)
LINUX_HEADERS_SITE_METHOD = git
else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y)
@@ -42,7 +46,7 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL)
LINUX_HEADERS_SITE_METHOD = hg
else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y)
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION)$(BR_FMT_VERSION_svn).tar.gz
LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL)
LINUX_HEADERS_SITE_METHOD = svn
else ifeq ($(LINUX_HEADERS_CIP),y)
@@ -102,6 +106,8 @@ LINUX_HEADERS_LICENSE_FILES = \
LICENSES/preferred/GPL-2.0 \
LICENSES/exceptions/Linux-syscall-note
endif
LINUX_HEADERS_CPE_ID_VENDOR = linux
LINUX_HEADERS_CPE_ID_PRODUCT = linux_kernel
LINUX_HEADERS_INSTALL_STAGING = YES