Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -6,6 +6,8 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
|
||||
choice
|
||||
prompt "Kernel Headers"
|
||||
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
|
||||
# We are intentionally staying at 4.19 for the next Buildroot
|
||||
# LTS release (2019.02)
|
||||
default BR2_KERNEL_HEADERS_4_19
|
||||
help
|
||||
Select the kernel version to get headers from.
|
||||
@@ -26,17 +28,6 @@ config BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
bool "Same as kernel being built"
|
||||
depends on BR2_LINUX_KERNEL
|
||||
|
||||
config BR2_KERNEL_HEADERS_3_2
|
||||
bool "Linux 3.2.x kernel headers"
|
||||
depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
|
||||
depends on !BR2_riscv
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
|
||||
|
||||
config BR2_KERNEL_HEADERS_4_1
|
||||
bool "Linux 4.1.x kernel headers"
|
||||
depends on !BR2_riscv
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
|
||||
|
||||
config BR2_KERNEL_HEADERS_4_4
|
||||
bool "Linux 4.4.x kernel headers"
|
||||
depends on !BR2_riscv
|
||||
@@ -52,18 +43,14 @@ config BR2_KERNEL_HEADERS_4_14
|
||||
depends on !BR2_riscv
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
|
||||
|
||||
config BR2_KERNEL_HEADERS_4_16
|
||||
bool "Linux 4.16.x kernel headers"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
|
||||
|
||||
config BR2_KERNEL_HEADERS_4_18
|
||||
bool "Linux 4.18.x kernel headers"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
|
||||
|
||||
config BR2_KERNEL_HEADERS_4_19
|
||||
bool "Linux 4.19.x kernel headers"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
|
||||
|
||||
config BR2_KERNEL_HEADERS_4_20
|
||||
bool "Linux 4.20.x kernel headers"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
|
||||
|
||||
config BR2_KERNEL_HEADERS_VERSION
|
||||
bool "Manually specified Linux version"
|
||||
help
|
||||
@@ -129,6 +116,10 @@ choice
|
||||
This is used to hide/show some packages that have strict
|
||||
requirements on the version of kernel headers.
|
||||
|
||||
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20
|
||||
bool "4.20.x"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_20
|
||||
|
||||
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19
|
||||
bool "4.19.x"
|
||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
|
||||
@@ -296,13 +287,11 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.102" if BR2_KERNEL_HEADERS_3_2
|
||||
default "4.1.52" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.4.166" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.143" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.86" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.16.18" if BR2_KERNEL_HEADERS_4_16
|
||||
default "4.18.20" if BR2_KERNEL_HEADERS_4_18
|
||||
default "4.4.180" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.180" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.123" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.47" if BR2_KERNEL_HEADERS_4_19
|
||||
default "4.20.17" if BR2_KERNEL_HEADERS_4_20
|
||||
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 \
|
||||
|
||||
@@ -27,42 +27,34 @@ LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTO
|
||||
LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_REPO_URL))
|
||||
endif # BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
# Configure tarball filenames.
|
||||
# Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration
|
||||
ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y)
|
||||
LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))
|
||||
else ifeq ($(LINUX_HEADERS_CUSTOM_GIT)$(LINUX_HEADERS_CUSTOM_HG)$(LINUX_HEADERS_CUSTOM_SVN),y)
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
|
||||
else
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
endif
|
||||
|
||||
# Configure the various kernel source locations.
|
||||
ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y)
|
||||
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_SITE = $(LINUX_HEADERS_REPO_URL)
|
||||
LINUX_HEADERS_SITE_METHOD = git
|
||||
else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y)
|
||||
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_SITE = $(LINUX_HEADERS_REPO_URL)
|
||||
LINUX_HEADERS_SITE_METHOD = svn
|
||||
else ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),)
|
||||
# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
|
||||
# older -rc kernels.
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
|
||||
LINUX_HEADERS_SITE = https://git.kernel.org/torvalds/t
|
||||
else
|
||||
# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
|
||||
# to use the $(word) function. We support versions such as 4.0, 3.1,
|
||||
# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
|
||||
else ifeq ($(findstring x3.,x$(LINUX_HEADERS_VERSION)),x3.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
|
||||
else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
|
||||
else
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_HEADERS_VERSION))).x
|
||||
endif # x2.6
|
||||
# release candidates are in testing/ subdir
|
||||
ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),)
|
||||
LINUX_HEADERS_SITE := $(LINUX_HEADERS_SITE)/testing
|
||||
endif # -rc
|
||||
endif # LINUX_HEADERS_CUSTOM_TARBALL
|
||||
|
||||
# Apply any necessary patches if we are using the headers from a kernel
|
||||
|
||||
Reference in New Issue
Block a user