Skip to contentSkip to conversation

linux-headers: drop 4.17, fix legacy

PATCH New Yann E. MORIN 2 participants 5 messages Oct 4, 2018 – Oct 7, 2018

lore
Share & tools
lore
#0 lore raw

cover linux-headers: drop 4.17, fix legacy

Hello All!

This two-patch series fixes the legacy handling for dropped kernel header versions, and drops the 4.17 one (that was already partially and incorrectly dropped during the merge of next).

Regards,
Yann E. MORIN.

The following changes since commit 51e17496cc403c49bc20d3a81f9c71a8a20edd0f

gnupg: drop mandatory dependency on ncurses (2018-10-04 15:35:50 +0200)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to c1b6a02f6b6624c3138535318f5bfe6e9090ce4b

package/linux-headers: really drop the 4.17 choice (2018-10-04 21:55:39 +0200)

----------------------------------------------------------------
Yann E. MORIN (2):
legacy: don't select kernel headers package/linux-headers: really drop the 4.17 choice

 Config.in.legacy                     | 129 +++++++----------------------------
 package/linux-headers/Config.in.host |   4 --
 2 files changed, 23 insertions(+), 110 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 legacy: don't select kernel headers

The kernel headers versions are parts of a choice, so we can't select them.

Cc Thomas Petazzoni <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 Config.in.legacy | 122 ++++++++-----------------------------------------------
 1 file changed, 16 insertions(+), 106 deletions(-)
Config.in.legacy +16 -106
index 20e2d5c8c6..c942fd8e81 100644
@@ -167,53 +167,38 @@ config BR2_PACKAGE_MESA3D_OPENGL_TEXTURE_FLOAT
 
 config BR2_KERNEL_HEADERS_4_10
 	bool "kernel headers version 4.10.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_9
 	select BR2_LEGACY
 	help
 	  Version 4.10.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.14.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_11
 	bool "kernel headers version 4.11.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_9
 	select BR2_LEGACY
 	help
 	  Version 4.11.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.14.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_12
 	bool "kernel headers version 4.12.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_9
 	select BR2_LEGACY
 	help
 	  Version 4.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.14.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_13
 	bool "kernel headers version 4.13.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_9
 	select BR2_LEGACY
 	help
 	  Version 4.13.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.14.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_15
 	bool "kernel headers version 4.15.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_14
 	select BR2_LEGACY
 	help
 	  Version 4.15.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.14.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 ###############################################################################
 comment "Legacy options removed in 2018.08"
@@ -1133,33 +1118,24 @@ comment "Legacy options removed in 2018.02"
 
 config BR2_KERNEL_HEADERS_3_4
 	bool "kernel headers version 3.4.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 3.4.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_3_10
 	bool "kernel headers version 3.10.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 3.10.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_3_12
 	bool "kernel headers version 3.12.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 3.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_BINUTILS_VERSION_2_27_X
 	bool "binutils version 2.27 support removed"
@@ -1710,23 +1686,17 @@ config BR2_PACKAGE_GMOCK
 
 config BR2_KERNEL_HEADERS_4_8
 	bool "kernel headers version 4.8.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.8.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.4.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_3_18
 	bool "kernel headers version 3.18.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.18.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 3.12.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_GLIBC_VERSION_2_22
 	bool "glibc 2.22 removed"
@@ -1749,43 +1719,31 @@ config BR2_PACKAGE_PERL_DB_FILE
 
 config BR2_KERNEL_HEADERS_4_7
 	bool "kernel headers version 4.7.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.7.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.4.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_6
 	bool "kernel headers version 4.6.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.6.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.4.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_5
 	bool "kernel headers version 4.5.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_4
 	select BR2_LEGACY
 	help
 	  Version 4.5.x of the Linux kernel headers are no longer
-	   maintained upstream and are now removed. As an alternative,
-	   version 4.4.x of the headers have been automatically
-	   selected in your configuration.
+	   maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_3_14
 	bool "kernel headers version 3.14.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	  help
 	  Version 3.14.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 3.12.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS
 	bool "musl-cross 1.1.12 toolchain removed"
@@ -1914,23 +1872,17 @@ config BR2_PACKAGE_SSTRIP
 
 config BR2_KERNEL_HEADERS_4_3
 	bool "kernel headers version 4.3.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 4.3.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_KERNEL_HEADERS_4_2
 	bool "kernel headers version 4.2.x are no longer supported"
-	select BR2_KERNEL_HEADERS_4_1
 	select BR2_LEGACY
 	help
 	  Version 4.2.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed. As an alternative,
-	  version 4.1.x of the headers have been automatically
-	  selected in your configuration.
+	  maintained upstream and are now removed.
 
 config BR2_PACKAGE_KODI_ADDON_XVDR
 	bool "kodi-addon-xvdr removed"
@@ -2005,24 +1957,18 @@ config BR2_GCC_VERSION_4_8_ARC
 
 config BR2_KERNEL_HEADERS_4_0
 	bool "kernel headers version 4.0.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 4.0.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.12.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_19
 	bool "kernel headers version 3.19.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.19.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
-	  As an alternative, version 3.12.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
 	bool "libevas-generic-loaders package removed"
@@ -2235,14 +2181,11 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_VOID
 
 config BR2_KERNEL_HEADERS_3_17
 	bool "kernel headers version 3.17.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.17.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
-	  As an alternative, version 3.12.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_GDB_VERSION_7_7
 	bool "gdb 7.7 has been removed"
@@ -2383,14 +2326,11 @@ config BR2_PACKAGE_CUPS_PDFTOPS
 
 config BR2_KERNEL_HEADERS_3_16
 	bool "kernel headers version 3.16.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.16.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
-	  As an alternative, version 3.12.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_PACKAGE_PYTHON_PYXML
 	bool "python-pyxml package has been removed"
@@ -2591,46 +2531,34 @@ config BR2_PACKAGE_BLACKBOX
 
 config BR2_KERNEL_HEADERS_3_0
 	bool "kernel headers version 3.0.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_2
 	select BR2_LEGACY
 	help
 	  Version 3.0.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.2.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_11
 	bool "kernel headers version 3.11.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_10
 	select BR2_LEGACY
 	help
 	  Version 3.11.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
-	  As an alternative, version 3.10.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_13
 	bool "kernel headers version 3.13.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.13.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
-	  As an alternative, version 3.12.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_15
 	bool "kernel headers version 3.15.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.15.x of the Linux kernel headers have been
 	  deprecated for more than four buildroot releases and are now
 	  removed.
-	  As an alternative, version 3.12.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_PACKAGE_DIRECTFB_EXAMPLES_ANDI
 	bool "DirectFB example df_andi has been removed"
@@ -3457,13 +3385,10 @@ config BR2_PACKAGE_LIBELF
 
 config BR2_KERNEL_HEADERS_3_8
 	bool "kernel headers version 3.8.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.8.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.4.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_PACKAGE_GETTEXT_TOOLS
 	bool "support for gettext-tools on target has been removed"
@@ -3616,23 +3541,17 @@ config BR2_PACKAGE_EVTEST_CAPTURE
 
 config BR2_KERNEL_HEADERS_3_6
 	bool "kernel headers version 3.6.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.6.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.4.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_7
 	bool "kernel headers version 3.7.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.7.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.4.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_PACKAGE_VALA
 	bool "vala target package has been removed"
@@ -3794,33 +3713,24 @@ config BR2_sh3eb
 
 config BR2_KERNEL_HEADERS_3_1
 	bool "kernel headers version 3.1.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_2
 	select BR2_LEGACY
 	help
 	  Version 3.1.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.2.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_3
 	bool "kernel headers version 3.3.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_2
 	select BR2_LEGACY
 	help
 	  Version 3.3.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.2.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_5
 	bool "kernel headers version 3.5.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_4
 	select BR2_LEGACY
 	help
 	  Version 3.5.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.4.x of the headers have been
-	  automatically selected in your configuration.
 
 config BR2_GDB_VERSION_7_2
 	bool "gdb 7.2.x is no longer supported"
Signature · 1 line
2.14.1
#2 lore raw

PATCH 1/2 legacy: don't select kernel headers

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

The kernel headers versions are parts of a choice, so we can't select them.

Cc Thomas Petazzoni <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Bernd Kuhls <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/linux-headers: really drop the 4.17 choice

In reply to Yann E. MORIN

Currently, the build fails when the kernel headers 4.17 are selected:

package/linux-headers/linux-headers.mk:149: *** LINUX_HEADERS_SITE cannot be empty when LINUX_HEADERS_SOURCE is not. Stop.

This is caused by an hickup during the last merge of the next branch, where the value for 4.17 got dropped from BR2DEFAULT_KERNEL_HEADERS, but the choice entry was left in.

The correct fix against that hickup would be to restore the 4.17 value. But since 4.17 is no longer maintained, the proper fix is to really drop 4.17 altogether.

For good this time! ;-)

---
 Config.in.legacy                     | 7 +++++++
 package/linux-headers/Config.in.host | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)
Config.in.legacy +7 -0
index c942fd8e81..c862532af2 100644
@@ -200,6 +200,13 @@ config BR2_KERNEL_HEADERS_4_15
 	  Version 4.15.x of the Linux kernel headers are no longer
 	  maintained upstream and are now removed.
 
+config BR2_KERNEL_HEADERS_4_17
+	bool "kernel headers version 4.17.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 4.17.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 ###############################################################################
 comment "Legacy options removed in 2018.08"
 
package/linux-headers/Config.in.host +0 -4
index 99f2954169..7c9c1d0fb0 100644
@@ -56,10 +56,6 @@ 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_17
-	bool "Linux 4.17.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17
-
 config BR2_KERNEL_HEADERS_4_18
 	bool "Linux 4.18.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18
Signature · 1 line
2.14.1
#4 lore raw

PATCH 2/2 package/linux-headers: really drop the 4.17 choice

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Currently, the build fails when the kernel headers 4.17 are selected:
package/linux-headers/linux-headers.mk:149: *** LINUX_HEADERS_SITE cannot be empty when LINUX_HEADERS_SOURCE is not. Stop.

This is caused by an hickup during the last merge of the next branch, where the value for 4.17 got dropped from BR2DEFAULT_KERNEL_HEADERS,

BR2_DEFAULT_KERNEL_HEADERS

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard