| Message ID | 20240526164346.564204-1-ju.o@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/1] configs/mx51evk: bump kernel to 5.10.218 to fix build | expand |
>>>>> "Julien" == Julien Olivain <ju.o@free.fr> writes: > Since commit dc0f721 "package/gcc: switch to 13.x as default", > mx51evk_defconfig is failing to build in Kernel (see [1]), > with output: > drivers/ata/libahci.c: In function 'ahci_led_store': > ././include/linux/compiler_types.h:315:45: error: call to '__compiletime_assert_328' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) > 315 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > | ^ > This commit fixes the issue by bumping the Kernel to 5.10.218. > The kernel commit fixing the build failure is [2], first included in > v5.10.184. There is also many other gcc-13 fixes. > While bumping the Kernel, this commit also enables > BR2_DOWNLOAD_FORCE_CHECK_HASHES=y, add the relevant archive hash files, > and removes the defconfig entry in ".checkpackageignore". > Fixes: [1] > [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/6918688967 > [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 > Signed-off-by: Julien Olivain <ju.o@free.fr> > --- > Note: I did not tested the generated image on an actual board > (I don't have access to it). > Changes v1 -> v2: > - Bump only the kernel to 5.10.218 (instead of 6.6.31). > - No longer bump uboot Committed, thanks.
diff --git a/.checkpackageignore b/.checkpackageignore index 9b9e4a61f9f..68c0ea83dd7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -235,7 +235,6 @@ configs/microchip_sama7g5ek_mmc_defconfig lib_defconfig.ForceCheckHash configs/microchip_sama7g5ek_mmc_dev_defconfig lib_defconfig.ForceCheckHash configs/minnowboard_max_defconfig lib_defconfig.ForceCheckHash configs/mx25pdk_defconfig lib_defconfig.ForceCheckHash -configs/mx51evk_defconfig lib_defconfig.ForceCheckHash configs/mx53loco_defconfig lib_defconfig.ForceCheckHash configs/mx6cubox_defconfig lib_defconfig.ForceCheckHash configs/mx6sx_udoo_neo_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx51evk/patches/linux-headers/linux-headers.hash b/board/freescale/imx51evk/patches/linux-headers/linux-headers.hash new file mode 120000 index 00000000000..5808d92afe8 --- /dev/null +++ b/board/freescale/imx51evk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx51evk/patches/linux/linux.hash b/board/freescale/imx51evk/patches/linux/linux.hash new file mode 100644 index 00000000000..fdda2dfdaa8 --- /dev/null +++ b/board/freescale/imx51evk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From: https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc +sha256 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 linux-5.10.218.tar.xz diff --git a/board/freescale/imx51evk/patches/uboot/uboot.hash b/board/freescale/imx51evk/patches/uboot/uboot.hash new file mode 100644 index 00000000000..716b56e14d4 --- /dev/null +++ b/board/freescale/imx51evk/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 u-boot-2021.01.tar.bz2 diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index a4bebdec976..e633a6228d7 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -2,6 +2,10 @@ BR2_arm=y BR2_cortex_a8=y +# Global patches directory and hash check +BR2_GLOBAL_PATCH_DIR="board/freescale/imx51evk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y + # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y @@ -28,7 +32,7 @@ BR2_TARGET_UBOOT_FORMAT_IMX=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.218" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage"
Since commit dc0f721 "package/gcc: switch to 13.x as default", mx51evk_defconfig is failing to build in Kernel (see [1]), with output: drivers/ata/libahci.c: In function 'ahci_led_store': ././include/linux/compiler_types.h:315:45: error: call to '__compiletime_assert_328' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long) 315 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ This commit fixes the issue by bumping the Kernel to 5.10.218. The kernel commit fixing the build failure is [2], first included in v5.10.184. There is also many other gcc-13 fixes. While bumping the Kernel, this commit also enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y, add the relevant archive hash files, and removes the defconfig entry in ".checkpackageignore". Fixes: [1] [1] https://gitlab.com/buildroot.org/buildroot/-/jobs/6918688967 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c3ddc06cedb62f2904e58fd95170bf206bee149 Signed-off-by: Julien Olivain <ju.o@free.fr> --- Note: I did not tested the generated image on an actual board (I don't have access to it). Changes v1 -> v2: - Bump only the kernel to 5.10.218 (instead of 6.6.31). - No longer bump uboot --- .checkpackageignore | 1 - .../imx51evk/patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx51evk/patches/linux/linux.hash | 2 ++ board/freescale/imx51evk/patches/uboot/uboot.hash | 2 ++ configs/mx51evk_defconfig | 6 +++++- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 board/freescale/imx51evk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx51evk/patches/linux/linux.hash create mode 100644 board/freescale/imx51evk/patches/uboot/uboot.hash