diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
| commit | 1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch) | |
| tree | dd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/linux-headers/Config.in.host | |
| parent | 57dcad243e6daefefbe21109e1fc97272053a7a0 (diff) | |
| parent | 787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff) | |
| download | buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip | |
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.
A few conflicts had to be resolved:
- In the DEVELOPERS file, because Fabrice Fontaine was added as a
developer for libupnp in master, and for libupnp18 in
next. Resolution is simple: add him for both.
- linux/Config.in, because we updated the 4.13.x release used by
default in master, while we moved to 4.14 in next. Resolution: use
4.14.
- package/libupnp/libupnp.hash: a hash for the license file was added
in master, while the package was bumped into next. Resolution: keep
the hash for the license file, and keep the hash for the newest
version of libupnp.
- package/linux-headers/Config.in.host: default version of the kernel
headers for 4.13 was bumped to the latest 4.13.x in master, but was
changed to 4.14 in next. Resolution: use 4.14.
- package/samba4/: samba was bumped to 4.6.11 in master for security
reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/linux-headers/Config.in.host')
| -rw-r--r-- | package/linux-headers/Config.in.host | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cff856eaeb..b7f188cd72 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -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_4_13 + default BR2_KERNEL_HEADERS_4_14 help Select the kernel version to get headers from. @@ -74,6 +74,10 @@ config BR2_KERNEL_HEADERS_4_13 bool "Linux 4.13.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 +config BR2_KERNEL_HEADERS_4_14 + bool "Linux 4.14.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + config BR2_KERNEL_HEADERS_VERSION bool "Manually specified Linux version" @@ -96,6 +100,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_14 + bool "4.14.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13 bool "4.13.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 @@ -250,4 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 default "4.13.16" if BR2_KERNEL_HEADERS_4_13 + default "4.14" if BR2_KERNEL_HEADERS_4_14 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION |
