aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in.legacy10
-rw-r--r--linux/Config.in13
-rw-r--r--linux/linux.mk3
3 files changed, 10 insertions, 16 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 793b11619c..b38cf9079a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,16 @@ endif
###############################################################################
comment "Legacy options removed in 2016.02"
+config BR2_LINUX_KERNEL_SAME_AS_HEADERS
+ bool "using the linux headers version for the kernel has been removed"
+ select BR2_LEGACY
+ help
+ The option to use the version of the kernel headers for the
+ kernel to build has been removed.
+
+ There is now the converse, better-suited and more versatile
+ option to use the kernel version for the linux headers.
+
config BR2_PACKAGE_CUPS_PDFTOPS
bool "Pdftops support has been removed from Cups"
select BR2_LEGACY
diff --git a/linux/Config.in b/linux/Config.in
index 8971192873..4d972e1447 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -29,18 +29,6 @@ choice
config BR2_LINUX_KERNEL_LATEST_VERSION
bool "4.4.1"
-config BR2_LINUX_KERNEL_SAME_AS_HEADERS
- bool "Same as toolchain kernel headers"
- depends on !BR2_KERNEL_HEADERS_AS_KERNEL
- depends on BR2_TOOLCHAIN_BUILDROOT
- help
- This option will re-use the same kernel sources as the one
- that have been used for the kernel headers of the
- cross-compiling toolchain. Having the same version for the
- kernel running on the system and for the kernel headers is
- not a requirement, but using the same version allows to
- download only one tarball of the kernel sources.
-
config BR2_LINUX_KERNEL_CUSTOM_VERSION
bool "Custom version"
help
@@ -117,7 +105,6 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
config BR2_LINUX_KERNEL_VERSION
string
default "4.4.1" if BR2_LINUX_KERNEL_LATEST_VERSION
- default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
diff --git a/linux/linux.mk b/linux/linux.mk
index c9986cd8a9..578fea1a58 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -28,9 +28,6 @@ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
endif
-ifeq ($(BR2_LINUX_KERNEL_SAME_AS_HEADERS)$(BR2_KERNEL_HEADERS_VERSION),yy)
-BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
-endif
# 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.