linux: drop the option to use the same version as that of the headers

It is no longer meaningful, now that we have the option to use the
kernel version for the linux headers, as it is more logical and more
versatile.

Add it to legacy.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2016-02-06 00:06:17 +01:00 committed by Thomas Petazzoni
parent 036ac26a29
commit e3e0583f90
3 changed files with 10 additions and 16 deletions

View File

@ -145,6 +145,16 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2016.02" 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 config BR2_PACKAGE_CUPS_PDFTOPS
bool "Pdftops support has been removed from Cups" bool "Pdftops support has been removed from Cups"
select BR2_LEGACY select BR2_LEGACY

View File

@ -29,18 +29,6 @@ choice
config BR2_LINUX_KERNEL_LATEST_VERSION config BR2_LINUX_KERNEL_LATEST_VERSION
bool "4.4.1" 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 config BR2_LINUX_KERNEL_CUSTOM_VERSION
bool "Custom version" bool "Custom version"
help help
@ -117,7 +105,6 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
config BR2_LINUX_KERNEL_VERSION config BR2_LINUX_KERNEL_VERSION
string string
default "4.4.1" if BR2_LINUX_KERNEL_LATEST_VERSION 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 \ default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

View File

@ -28,9 +28,6 @@ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE) BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
endif 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 # 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, # 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. # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.