Skip to contentSkip to conversation

toolchain/Config.in: correct BR2_TOOLCHAIN_HEADERS_AT_LEAST for 5.17

PATCH In review Peter Korsgaard 2 participants 13 messages Oct 4, 2022 – Oct 6, 2022 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 toolchain/Config.in: correct BR2_TOOLCHAIN_HEADERS_AT_LEAST for 5.17

Missed from commit 2b134f9549d ({toolchain, linux-headers}: add support for 5.17.x headers).

---
 toolchain/Config.in | 1 +
 1 file changed, 1 insertion(+)
toolchain/Config.in +1 -0
index b48c69dc41..219578092b 100644
@@ -580,6 +580,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
 	default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
 	default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/11 {toolchain, linux-headers}: add support for 5.18 headers

Do not add a preconfigured 5.18.x version to linux-headers as 5.18.x is already EOL.

---
 package/linux-headers/Config.in.host                        | 6 +++++-
 toolchain/Config.in                                         | 5 +++++
 .../toolchain-external-custom/Config.in.options             | 6 +++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
package/linux-headers/Config.in.host +5 -1
index ab59bdd368..9d993a2e99 100644
@@ -133,8 +133,12 @@ choice
 	  If your kernel headers are more recent than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18
+	bool "5.18.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17
-	bool "5.17.x or later"
+	bool "5.17.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16
toolchain/Config.in +5 -0
index 219578092b..c49691cff2 100644
@@ -567,6 +567,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 
 # This should be selected by the latest version, above, to indicate that
@@ -580,6 +584,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
 	default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +5 -1
index 6727778f42..16f1ac0a5e 100644
@@ -127,8 +127,12 @@ choice
 	  If your toolchain uses headers newer than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18
+	bool "5.18.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_17
-	bool "5.17.x or later"
+	bool "5.17.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

PATCH 3/11 {toolchain, linux-headers}: add support for 5.19 headers

In reply to Peter Korsgaard

And add (and default to) 5.19.13 to linux-headers.

---
 linux/linux.hash                                    |  1 +
 package/linux-headers/Config.in.host                | 13 +++++++++++--
 toolchain/Config.in                                 |  5 +++++
 .../toolchain-external-custom/Config.in.options     |  6 +++++-
 4 files changed, 22 insertions(+), 3 deletions(-)
linux/linux.hash +1 -0
index a1b7984489..9e75877be9 100644
@@ -1,4 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
+sha256  4ecdb8b59c6f6f258d89cbf22eede210e0a55c09db884988fe706efe2fe8f148  linux-5.19.13.tar.xz
 sha256  4a1c922a490eeabf5b44d4fde36de9ba5b71711b7352c6258716da41160db628  linux-5.17.15.tar.xz
 sha256  da47d9a80b694548835ccb553b6eb1a1f3f5d5cddd9e2bd6f4886b99ca14f940  linux-5.15.67.tar.xz
 sha256  3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268  linux-5.10.142.tar.xz
package/linux-headers/Config.in.host +11 -2
index 9d993a2e99..856c7fd7b1 100644
@@ -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_5_17
+	default BR2_KERNEL_HEADERS_5_19
 	help
 	  Select the kernel version to get headers from.
 
@@ -56,6 +56,10 @@ config BR2_KERNEL_HEADERS_5_15
 config BR2_KERNEL_HEADERS_5_17
 	bool "Linux 5.17.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
+
+config BR2_KERNEL_HEADERS_5_19
+	bool "Linux 5.19.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	select BR2_KERNEL_HEADERS_LATEST
 
 config BR2_KERNEL_HEADERS_VERSION
@@ -133,8 +137,12 @@ choice
 	  If your kernel headers are more recent than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19
+	bool "5.19.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18
-	bool "5.18.x or later"
+	bool "5.18.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17
@@ -387,6 +395,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.10.142"	if BR2_KERNEL_HEADERS_5_10
 	default "5.15.67"	if BR2_KERNEL_HEADERS_5_15
 	default "5.17.15"	if BR2_KERNEL_HEADERS_5_17
+	default "5.19.13"	if BR2_KERNEL_HEADERS_5_19
 	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 \
toolchain/Config.in +5 -0
index c49691cff2..0801a3c516 100644
@@ -571,6 +571,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 
 # This should be selected by the latest version, above, to indicate that
@@ -584,6 +588,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
 	default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +5 -1
index 16f1ac0a5e..494e67516f 100644
@@ -127,8 +127,12 @@ choice
 	  If your toolchain uses headers newer than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19
+	bool "5.19.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18
-	bool "5.18.x or later"
+	bool "5.18.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_17
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

PATCH 4/11 {toolchain, linux-headers}: add support for 6.0 headers

In reply to Peter Korsgaard

And add (and default to) 6.0 to linux-headers.

---
 linux/linux.hash                                    |  2 ++
 package/linux-headers/Config.in.host                | 13 +++++++++++--
 toolchain/Config.in                                 |  5 +++++
 .../toolchain-external-custom/Config.in.options     |  6 +++++-
 4 files changed, 23 insertions(+), 3 deletions(-)
linux/linux.hash +2 -0
index 9e75877be9..dde8e5c54c 100644
@@ -1,3 +1,5 @@
+# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256  5c2443a5538de52688efb55c27ab0539c1f5eb58c0cfd16a2b9fbb08fd81788e  linux-6.0.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256  4ecdb8b59c6f6f258d89cbf22eede210e0a55c09db884988fe706efe2fe8f148  linux-5.19.13.tar.xz
 sha256  4a1c922a490eeabf5b44d4fde36de9ba5b71711b7352c6258716da41160db628  linux-5.17.15.tar.xz
package/linux-headers/Config.in.host +11 -2
index 856c7fd7b1..4847cd4c87 100644
@@ -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_5_19
+	default BR2_KERNEL_HEADERS_6_0
 	help
 	  Select the kernel version to get headers from.
 
@@ -60,6 +60,10 @@ config BR2_KERNEL_HEADERS_5_17
 config BR2_KERNEL_HEADERS_5_19
 	bool "Linux 5.19.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
+
+config BR2_KERNEL_HEADERS_6_0
+	bool "Linux 6.0.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
 	select BR2_KERNEL_HEADERS_LATEST
 
 config BR2_KERNEL_HEADERS_VERSION
@@ -137,8 +141,12 @@ choice
 	  If your kernel headers are more recent than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0
+	bool "6.0.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19
-	bool "5.19.x or later"
+	bool "5.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18
@@ -396,6 +404,7 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.15.67"	if BR2_KERNEL_HEADERS_5_15
 	default "5.17.15"	if BR2_KERNEL_HEADERS_5_17
 	default "5.19.13"	if BR2_KERNEL_HEADERS_5_19
+	default "6.0"		if BR2_KERNEL_HEADERS_6_0
 	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 \
toolchain/Config.in +5 -0
index 0801a3c516..23596d6c85 100644
@@ -575,6 +575,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 
 # This should be selected by the latest version, above, to indicate that
@@ -588,6 +592,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "6.0"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
 	default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 	default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18
 	default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +5 -1
index 494e67516f..a9cb61365f 100644
@@ -127,8 +127,12 @@ choice
 	  If your toolchain uses headers newer than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0
+	bool "6.0.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19
-	bool "5.19.x or later"
+	bool "5.19.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
 
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

PATCH 5/11 linux: bump _KERNEL_LATEST_VERSION to 6.0

In reply to Peter Korsgaard
---
 linux/Config.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
linux/Config.in +3 -3
index de9bf0ad7a..029976569e 100644
@@ -28,8 +28,8 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (5.17)"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 if BR2_KERNEL_HEADERS_AS_KERNEL
+	bool "Latest version (6.0)"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 if BR2_KERNEL_HEADERS_AS_KERNEL
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (5.10.115-cip7)"
@@ -128,7 +128,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.17.15" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "6.0" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "5.10.115-cip7" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "5.10.109-cip5-rt4" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH 6/11 package/linux-headers: drop 5.17.x option

In reply to Peter Korsgaard

The 5.17.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it.

---
 Config.in.legacy                     | 7 +++++++
 package/linux-headers/Config.in.host | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)
Config.in.legacy +7 -0
index 93d921160a..0e63d59a98 100644
@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2022.11"
 
+config BR2_KERNEL_HEADERS_5_17
+	bool "kernel headers version 5.17.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.17.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_iwmmxt
 	bool "ARM iwmmxt variant removed"
 	select BR2_LEGACY
package/linux-headers/Config.in.host +0 -5
index 4847cd4c87..7aee67de56 100644
@@ -53,10 +53,6 @@ config BR2_KERNEL_HEADERS_5_15
 	bool "Linux 5.15.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
 
-config BR2_KERNEL_HEADERS_5_17
-	bool "Linux 5.17.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17
-
 config BR2_KERNEL_HEADERS_5_19
 	bool "Linux 5.19.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19
@@ -402,7 +398,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "5.4.212"	if BR2_KERNEL_HEADERS_5_4
 	default "5.10.142"	if BR2_KERNEL_HEADERS_5_10
 	default "5.15.67"	if BR2_KERNEL_HEADERS_5_15
-	default "5.17.15"	if BR2_KERNEL_HEADERS_5_17
 	default "5.19.13"	if BR2_KERNEL_HEADERS_5_19
 	default "6.0"		if BR2_KERNEL_HEADERS_6_0
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

PATCH 7/11 nezha_defconfig: specify 5.19 kernel headers

In reply to Peter Korsgaard

The defconfig uses a 5.19-rc1 based kernel, so specify 5.19 kernel headers now that is available.

---
 configs/nezha_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/nezha_defconfig +1 -1
index 2e2df3c09d..5d0948a013 100644
@@ -1,6 +1,6 @@
 BR2_riscv=y
 BR2_GLOBAL_PATCH_DIR="board/nezha/patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_OVERLAY="board/nezha/overlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#7 lore raw

PATCH 8/11 mender_x86_64_efi_defconfig: specify 5.18 kernel headers

In reply to Peter Korsgaard

The defconfig uses a 5.18.4 kernel, so specify 5.18 kernel headers now that is available.

---
 configs/mender_x86_64_efi_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/mender_x86_64_efi_defconfig +1 -1
index 6919a60c90..2ec6f6f76c 100644
@@ -2,7 +2,7 @@
 BR2_x86_64=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#8 lore raw

PATCH 9/11 configs/{canaan, sipeed_maix}*: specify kernel headers version

In reply to Peter Korsgaard

The defconfigs use a 5.19 kernel, so specify 5.19 kernel headers now that is available.

---
 configs/canaan_kd233_defconfig            | 3 +++
 configs/sipeed_maix_bit_defconfig         | 3 +++
 configs/sipeed_maix_bit_sdcard_defconfig  | 3 +++
 configs/sipeed_maix_dock_defconfig        | 3 +++
 configs/sipeed_maix_dock_sdcard_defconfig | 3 +++
 configs/sipeed_maix_go_defconfig          | 3 +++
 configs/sipeed_maix_go_sdcard_defconfig   | 3 +++
 configs/sipeed_maixduino_defconfig        | 3 +++
 configs/sipeed_maixduino_sdcard_defconfig | 3 +++
 9 files changed, 27 insertions(+)
configs/canaan_kd233_defconfig +3 -0
index 3aa5dccf08..77b8abf531 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_bit_defconfig +3 -0
index d2bac9e0b8..d73ba0266a 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_bit_sdcard_defconfig +3 -0
index e1c9dc417e..8a19996090 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_dock_defconfig +3 -0
index a7f0441e53..ccb563310e 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_dock_sdcard_defconfig +3 -0
index 6b7f8d9c68..d3d0f405e1 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_go_defconfig +3 -0
index a68f9d3b72..c3bcf98f81 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_go_sdcard_defconfig +3 -0
index a127872cd8..75300997b8 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maixduino_defconfig +3 -0
index c52adb5db7..a30596af92 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maixduino_sdcard_defconfig +3 -0
index baaa2bc7bb..add9369747 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Reviewed-by Damien Le Moal on v1 9/11
#9 lore raw

Re: [Buildroot] [PATCH 09/11] configs/{canaan, sipeed_maix}*: specify kernel headers version

Quoted 4 lines · Peter Korsgaard

The defconfigs use a 5.19 kernel, so specify 5.19 kernel headers now that is available.

Looks good to me.

Quoted 138 lines
---
 configs/canaan_kd233_defconfig            | 3 +++
 configs/sipeed_maix_bit_defconfig         | 3 +++
 configs/sipeed_maix_bit_sdcard_defconfig  | 3 +++
 configs/sipeed_maix_dock_defconfig        | 3 +++
 configs/sipeed_maix_dock_sdcard_defconfig | 3 +++
 configs/sipeed_maix_go_defconfig          | 3 +++
 configs/sipeed_maix_go_sdcard_defconfig   | 3 +++
 configs/sipeed_maixduino_defconfig        | 3 +++
 configs/sipeed_maixduino_sdcard_defconfig | 3 +++
 9 files changed, 27 insertions(+)
configs/canaan_kd233_defconfig +3 -0
index 3aa5dccf08..77b8abf531 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_bit_defconfig +3 -0
index d2bac9e0b8..d73ba0266a 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_bit_sdcard_defconfig +3 -0
index e1c9dc417e..8a19996090 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_dock_defconfig +3 -0
index a7f0441e53..ccb563310e 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_dock_sdcard_defconfig +3 -0
index 6b7f8d9c68..d3d0f405e1 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_go_defconfig +3 -0
index a68f9d3b72..c3bcf98f81 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maix_go_sdcard_defconfig +3 -0
index a127872cd8..75300997b8 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maixduino_defconfig +3 -0
index c52adb5db7..a30596af92 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Binary format
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
configs/sipeed_maixduino_sdcard_defconfig +3 -0
index baaa2bc7bb..add9369747 100644
@@ -10,6 +10,9 @@ BR2_RISCV_ISA_CUSTOM_RVC=y
 # BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # System
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
Signature · 7 lines
Damien Le Moal
Western Digital Research

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#10 lore raw

PATCH 10/11 qemu_riscv64_nommu_virt_defconfig: specify kernel headers version

In reply to Peter Korsgaard

The defconfigs uses a 5.19 kernel, so specify 5.19 kernel headers now that is available.

---
 configs/qemu_riscv64_nommu_virt_defconfig | 3 +++
 1 file changed, 3 insertions(+)
configs/qemu_riscv64_nommu_virt_defconfig +3 -0
index 5fab255d88..ee70beb208 100644
@@ -3,6 +3,9 @@ BR2_riscv=y
 BR2_RISCV_64=y
 # BR2_RISCV_USE_MMU is not set
 
+# Linux headers same as kernel, a 5.19 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y
+
 # Busybox with hush
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
 
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#11 lore raw

PATCH 11/11 friendlyarm_nanopi_r2s_defconfig: specify kernel headers version

In reply to Peter Korsgaard

The defconfigs uses a 5.16 kernel, so specify 5.16 kernel headers to match.

---
 configs/friendlyarm_nanopi_r2s_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/friendlyarm_nanopi_r2s_defconfig +1 -0
index ce252a5d76..284b28ec31 100644
@@ -1,6 +1,7 @@
 BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
 BR2_TARGET_GENERIC_HOSTNAME="rk3328-nanopi-r2s"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Nanopi R2S RK3328"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-r2s/post-build.sh"
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#12 lore raw
In reply to Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Missed from commit 2b134f9549d ({toolchain, linux-headers}: add support for 5.17.x headers).

Committed series, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot