summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-03-04 22:31:37 +0100
committerPeter Korsgaard <peter@korsgaard.com>2018-03-30 21:02:05 +0200
commita0743c2446b9cfe118a0b12d4b4a5aec97804f35 (patch)
tree6021d6568227940fbca3f9d1a37c372795bd78ca
parentd52be979ded7a95028a0b9a169c963de9c177a9d (diff)
downloadbuildroot-a0743c2446b9cfe118a0b12d4b4a5aec97804f35.tar.gz
buildroot-a0743c2446b9cfe118a0b12d4b4a5aec97804f35.zip
configs/ts4900: explicitly specify Linux kernel version
The ts4900 defconfig currently fails to build because it selects kernel headers 4.12, but doesn't specify a kernel version, and therefore 4.15 is built causing the following error: Incorrect selection of kernel headers: expected 4.12.x, got 4.15.x In commit 7c3a7d808e751d4b608a4c50a0ae4d13dedebab7 ("configs/ts4900: bump kernel version to 4.12"), when this defconfig was switched from using a vendor provided kernel to the mainline kernel, the kernel version was no longer explicitly specified. Since this commit indicated 4.12, and the kernel headers version selected is also 4.12, we also use that as the fixed kernel version. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/55306955 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit a3f2e977cdda32ceea9b6e445066fc9d1ab2bdd2) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--configs/ts4900_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/ts4900_defconfig b/configs/ts4900_defconfig
index 082234fcad..e7950cea4b 100644
--- a/configs/ts4900_defconfig
+++ b/configs/ts4900_defconfig
@@ -3,6 +3,8 @@ BR2_cortex_a9=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/technologic/ts4900/post-image.sh"
BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
OpenPOWER on IntegriCloud