[Buildroot] [PATCH] configs/pc_x86_64_{bios, efi}_defconfig: unbreak after qemu bump to linux-4.11

[Buildroot] [PATCH] configs/pc_x86_64_{bios, efi}_defconfig: unbreak after qemu bump to linux-4.11

[Peter Korsgaard]

The pc_x86_64 defconfigs reuse the linux configuration from qemu_x86_64, but
they weren't adjusted when this was updated to use linux-4.11 in 28d97609b25
(configs/qemu: bump to the latest kernel version), breaking the build.

Fix it by also moving them to linux-4.11.x.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 configs/pc_x86_64_bios_defconfig | 8 ++++----
 configs/pc_x86_64_efi_defconfig  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig
index 65b0016031..b8515d12b6 100644
--- a/configs/pc_x86_64_bios_defconfig
+++ b/configs/pc_x86_64_bios_defconfig
@@ -21,15 +21,15 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=120000
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh"
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.11.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pc/linux-extras.config"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig
index 57b3ec2fec..212d72f7f4 100644
--- a/configs/pc_x86_64_efi_defconfig
+++ b/configs/pc_x86_64_efi_defconfig
@@ -24,15 +24,15 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=120000
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh"
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.11.5.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pc/linux-extras.config"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
-- 
2.11.0

[Buildroot] [PATCH] configs/pc_x86_64_{bios, efi}_defconfig: unbreak after qemu bump to linux-4.11

[Waldemar Brodkorb]

Hi,

> Am 14.06.2017 um 23:36 schrieb Peter Korsgaard <peter@korsgaard.com>:
> 
> The pc_x86_64 defconfigs reuse the linux configuration from qemu_x86_64, ..

Wouldn't it be better to decouple the usage of the configs. I find it not obvious that they share the same kernel config.

Best regards
 Waldemar 

[Buildroot] [PATCH] configs/pc_x86_64_{bios, efi}_defconfig: unbreak after qemu bump to linux-4.11

[Peter Korsgaard]

>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:

 > Hi,
 >> Am 14.06.2017 um 23:36 schrieb Peter Korsgaard <peter@korsgaard.com>:
 >> 
 >> The pc_x86_64 defconfigs reuse the linux configuration from qemu_x86_64, ..

 > Wouldn't it be better to decouple the usage of the configs. I find it
 > not obvious that they share the same kernel config.

True. I've pushed this commit + a commit to use a dedicated linux
config for these pc defconfigs.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] configs/pc_x86_64_{bios, efi}_defconfig: unbreak after qemu bump to linux-4.11

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > The pc_x86_64 defconfigs reuse the linux configuration from qemu_x86_64, but
 > they weren't adjusted when this was updated to use linux-4.11 in 28d97609b25
 > (configs/qemu: bump to the latest kernel version), breaking the build.

 > Fix it by also moving them to linux-4.11.x.

 > Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard