defconfigs: add the _AT_LEAST_X_Y headers options

Since commit 2a5cf5e (check kernel headers version), we also need to
specify the series of the custom kernel headers version.

The defconfigs file that define such a custom kernel headers version
now fail to build.

Add the required _AT_LEAST_X_Y options to those config files. Done with
this (convoluted but very fast, uch faster ythan manual editing!) rule:

    for f in $( git grep -l BR2_DEFAULT_KERNEL_VERSION=\"3 ); do
        grep -E '^BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_' "${f}" >/dev/null && continue
        sed -r -e '/^(BR2_DEFAULT_KERNEL_VERSION="3\.([[:digit:]]+).*")$/s//\1\nBR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_\2=y/' "${f}"
    done

Only kernels >= 3.0 need those options in the defconfig, since the
default for 2.6.x kernels is correct (selects _AT_LEAST_2_6), and
the default is not saved in a defconfig.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig
index 26f313e2b1ea116d047bee9bc26ad79ee93ec252..7e33a41f1962125ae9bb0beae8c3164af571b22b 100644 (file)
--- a/configs/armadeus_apf27_defconfig
+++ b/configs/armadeus_apf27_defconfig
@@ -5,6 +5,7 @@ BR2_arm926t=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.13.2"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
 
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf27"

diff --git a/configs/armadeus_apf28_defconfig b/configs/armadeus_apf28_defconfig
index 06a6e769e2d778fb1f9884d024235981f8ffb62f..95d56a5ed6b189bae57b0ff4e85118ba8173c660 100644 (file)
--- a/configs/armadeus_apf28_defconfig
+++ b/configs/armadeus_apf28_defconfig
@@ -5,6 +5,7 @@ BR2_arm926t=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.12.7"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf28"

diff --git a/configs/armadeus_apf51_defconfig b/configs/armadeus_apf51_defconfig
index 0a0de6f183a2447a7bd6ea040ee991790eb9dd2a..7e932fba0851c2248042a00a0f2e2d4942ad1250 100644 (file)
--- a/configs/armadeus_apf51_defconfig
+++ b/configs/armadeus_apf51_defconfig
@@ -5,6 +5,7 @@ BR2_cortex_a8=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.12.6"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf51"

diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig
index 33e9a766bc7e3ea37d3c2b1bfbbba4c97ec34827..b42f757ec105269e57ba6a333a1d4d8c42548ba9 100644 (file)
--- a/configs/armadeus_apf9328_defconfig
+++ b/configs/armadeus_apf9328_defconfig
@@ -18,6 +18,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.1.1"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_1=y
 
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf9328"

diff --git a/configs/at91sam9260eknf_defconfig b/configs/at91sam9260eknf_defconfig
index 895add141a6a35d349ed5b36c4b9a8118e745a05..dba0cd5eaf172ab16895610efd25264cfc7c1ce8 100644 (file)
--- a/configs/at91sam9260eknf_defconfig
+++ b/configs/at91sam9260eknf_defconfig
@@ -5,6 +5,7 @@ BR2_arm926t=y
 # Toolchain
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.9.1"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y

diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 60764e64ad097934197b5c28240c6b4226285dbb..1d346c2f9ff80263f625a13bfa0a4a723cf220e7 100644 (file)
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -5,6 +5,7 @@ BR2_arm926t=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.1.6"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_1=y
 
 # Host utilities
 #

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 5490241c60eef9427bc24573ec4c429f517993c3..cf727f99639107fbfe354e638e6c946be9fec864 100644 (file)
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -5,6 +5,7 @@ BR2_avr32=y
 # below.
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.9.11"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # Filesystems
 BR2_TARGET_ROOTFS_JFFS2=y

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index f73497cf8181697ddc889022db6d3d31dc7f32f8..6a77b41048d38cb2dfb3208b239d0f0ad0d73ffc 100644 (file)
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -4,6 +4,7 @@ BR2_avr32=y
 # Lock to same version as kernel
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.9.11"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # U-Boot
 BR2_TARGET_UBOOT=y

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index 15220ed2c0b1242df666ef2fa91dde0c4a1d4e84..3181c66094de641d376d066b1faea7399a9166a2 100644 (file)
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -17,6 +17,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.12.10"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # bootloader
 BR2_TARGET_UBOOT=y

diff --git a/configs/calao_tny_a9g20_lpw_defconfig b/configs/calao_tny_a9g20_lpw_defconfig
index c8c341a987f87092ad3fc79dc4957ab376cb78b0..6a719970ddadfac6aa09dae01817272088133a80 100644 (file)
--- a/configs/calao_tny_a9g20_lpw_defconfig
+++ b/configs/calao_tny_a9g20_lpw_defconfig
@@ -12,6 +12,7 @@ BR2_TARGET_ROOTFS_UBIFS=y
 # lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.9.4"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # bootloaders
 BR2_TARGET_AT91BOOTSTRAP=y

diff --git a/configs/gnublin_defconfig b/configs/gnublin_defconfig
index acb455130bbd4f28af2479ed8521c5cac5575933..369c9da62c42103fb61b4945a454f8b473354373 100644 (file)
--- a/configs/gnublin_defconfig
+++ b/configs/gnublin_defconfig
@@ -5,6 +5,7 @@ BR2_arm926t=y
 # System
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.7"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_7=y
 BR2_TARGET_GENERIC_ISSUE="Welcome to Gnublin"
 
 # Filesystem

diff --git a/configs/mini2440_defconfig b/configs/mini2440_defconfig
index 6adcea0f4e96c3c05fb4b7a4b13cd7056c8f085d..d7d9ab18278a7b0b0c82c1d7634c7fa044d04768 100644 (file)
--- a/configs/mini2440_defconfig
+++ b/configs/mini2440_defconfig
@@ -19,6 +19,7 @@ BR2_TARGET_ROOTFS_TAR=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.0.4"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y

diff --git a/configs/minnowboard_defconfig b/configs/minnowboard_defconfig
index 5fdfd4354506bccb45cf82b4ab394efd7eea7b9f..e6f1a5559e1b98fb67a8a96a71fd9cb7bf579fe5 100644 (file)
--- a/configs/minnowboard_defconfig
+++ b/configs/minnowboard_defconfig
@@ -9,6 +9,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
 # Lock to 3.8 headers
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y

diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig
index 09f25e186758662d52922151d011563390885f3a..401a6026db84aae93e73feb21167483c002f11ec 100644 (file)
--- a/configs/pandaboard_defconfig
+++ b/configs/pandaboard_defconfig
@@ -14,6 +14,7 @@ BR2_TARGET_ROOTFS_EXT2=y
 # Lock to 3.12 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.12.2"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # Kernel
 BR2_LINUX_KERNEL=y

diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 90ca90609b33d5b4663f4819d357377dc45ca514..dec1ce05a91ec442b41e6b71cdbdc1c76b502356 100644 (file)
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -11,6 +11,7 @@ BR2_PACKAGE_RPI_FIRMWARE=y
 # Lock to 3.10 headers as the RPi kernel is based off the 3.10 branch
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.10.25"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 4161766f25f2663328f52a767266d79a6cf13632..d036622af95f59aab99db9a2ea608c5208b52ca3 100644 (file)
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -14,6 +14,7 @@ BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
 # Lock down headers to avoid breaking with new defaults
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.11.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_11=y
 
 # bootloader
 BR2_TARGET_UBOOT=y

diff --git a/configs/telit_evk_pro3_defconfig b/configs/telit_evk_pro3_defconfig
index fa9f8980e581b07e22054767b50d267fc8f91179..29a8d2a5ebcc9c4782c00bc659964163d1930f5c 100644 (file)
--- a/configs/telit_evk_pro3_defconfig
+++ b/configs/telit_evk_pro3_defconfig
@@ -5,6 +5,7 @@ BR2_arm926t=y
 # Toolchain
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.9.1"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y

diff --git a/configs/zedboard_defconfig b/configs/zedboard_defconfig
index 2a67fdd9de343094da0cc16deb0f0cddc88f5fcc..071ff65b4678d355f5af0ba358056381f526229f 100644 (file)
--- a/configs/zedboard_defconfig
+++ b/configs/zedboard_defconfig
@@ -5,6 +5,7 @@ BR2_ARM_ENABLE_NEON=y
 # Lock to 3.8 headers as the kernel is based off 3.8
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="3.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"