diff mbox series

[v1,2/2] configs/qemu_s390x_defconfig: update to Linux 6.10.1

Message ID 20240730064202.72774-2-egorenar@linux.ibm.com
State Changes Requested
Headers show
Series [v1,1/2] s390-tools: bump version to 2.33.1 | expand

Commit Message

Alexander Egorenkov July 30, 2024, 6:42 a.m. UTC
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
---
 configs/qemu_s390x_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni July 30, 2024, 7:08 a.m. UTC | #1
Hello Alexander,

On Tue, 30 Jul 2024 08:42:02 +0200
Alexander Egorenkov <egorenar@linux.ibm.com> wrote:

> Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>

Thanks for this update, but you need to also update the hash of the
Linux kernel tarball? Indeed since commit
d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37, we check all hashes,
including the hash of the Linux kernel tarball. By chance, maybe at the
time you tested this, linux/linux.hash contained the hash of Linux
6.10.1, but now it has been updated to 6.10.2, so linux/linux.hash no
longer contains the hash of the Linux tarball used by this defconfig.
Instead the hash of the Linux kernel tarball should be put in
board/qemu/patches/linux/linux.hash (which be careful is shared by all
Qemu defconfigs, so don't remove hashes that are still in use).

d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37 also aligned all Qemu
defconfigs to a single kernel version. I'm wondering if we shouldn't
keep this idea. It isn't super consistent to use a random kernel
version for each Qemu defconfig.

Best regards,

Thomas
Alexander Egorenkov July 30, 2024, 1:33 p.m. UTC | #2
Hi Thomas,


Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

> Hello Alexander,
>
> On Tue, 30 Jul 2024 08:42:02 +0200
> Alexander Egorenkov <egorenar@linux.ibm.com> wrote:
>
>> Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
>
> Thanks for this update, but you need to also update the hash of the
> Linux kernel tarball? Indeed since commit
> d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37, we check all hashes,
> including the hash of the Linux kernel tarball. By chance, maybe at the
> time you tested this, linux/linux.hash contained the hash of Linux
> 6.10.1, but now it has been updated to 6.10.2, so linux/linux.hash no
> longer contains the hash of the Linux tarball used by this defconfig.
> Instead the hash of the Linux kernel tarball should be put in
> board/qemu/patches/linux/linux.hash (which be careful is shared by all
> Qemu defconfigs, so don't remove hashes that are still in use).
>
> d037d9c2d63e9cd47b3701aaef8e28c32b8f5b37 also aligned all Qemu
> defconfigs to a single kernel version. I'm wondering if we shouldn't
> keep this idea. It isn't super consistent to use a random kernel
> version for each Qemu defconfig.

Sounds good to me too.
Thanks for the hints!
The new patch is on the way.

Regards
Alex
diff mbox series

Patch

diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig
index b22af68b0468..b85d3a996723 100644
--- a/configs/qemu_s390x_defconfig
+++ b/configs/qemu_s390x_defconfig
@@ -17,12 +17,12 @@  BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 
 # Linux headers same as kernel
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.1"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y