From 3c0fb10578b4b37dd280524567d0f3e26b186d0b Mon Sep 17 00:00:00 2001 From: Mikhail Malyshev Date: Thu, 27 Aug 2026 09:01:58 +0000 Subject: [PATCH] kernel: move amd64 to eve-kernel 6.18.46, hwe flavour for HV=k Point every amd64 build at the eve-kernel-amd64-v6.18.46-generic branch. HV=k selects the hwe config flavour, an Ubuntu-generic derivation with the full module set; PLATFORM=rt keeps rt, and every other HV keeps core. arm64 and riscv64 are untouched -- they have no 6.18 branch. HV therefore becomes an input to kernel selection alongside ZARCH and PLATFORM. It is set in the main Makefile well before kernel-version.mk is included, so no reordering is needed. Raise ROOTFS_MAXSIZE_MB from 290 to 295 for the non-k, non-nvidia builds. The 6.18 core rootfs measures 306,147,328 B (291.96 MiB), roughly 2 MiB over the historical 290 MiB check, so HV=kvm fails that assertion without this. The binding constraint is the 300 MB rootfs partition on devices installed by pre-10.2.0 EVE, so 295 retains 5 MB of margin against it. HV=k is unaffected, being already exempt at 10 GB; its hwe rootfs measures 563,175,424 B (537.09 MiB). Verified on amd64 by building and booting both flavours under QEMU. kvm boots 6.18.46-linuxkit-core-daa483f487da and k boots 6.18.46-hwe-daa483f487da, both to a login shell with no panics. bridge and veth are =m in hwe where core has them =y; both autoload on demand, so no explicit modprobe is required. Signed-off-by: Mikhail Malyshev --- Makefile | 2 +- kernel-commits.mk | 1 + kernel-version.mk | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7d57311f8ae..4c1d9932ac7 100644 --- a/Makefile +++ b/Makefile @@ -474,7 +474,7 @@ else PKGS_$(ZARCH)=$(shell find pkg -maxdepth 1 -type d | grep -Ev "eve|alpine|sources|kube|external-boot-image$$") # nvidia platform requires more space ifeq (, $(findstring nvidia,$(PLATFORM))) - ROOTFS_MAXSIZE_MB=290 + ROOTFS_MAXSIZE_MB=295 else ROOTFS_MAXSIZE_MB=10240 endif diff --git a/kernel-commits.mk b/kernel-commits.mk index 27916270513..b5e9f30f96d 100644 --- a/kernel-commits.mk +++ b/kernel-commits.mk @@ -1,5 +1,6 @@ KERNEL_COMMIT_amd64_next_generic = a65e45508b45 KERNEL_COMMIT_amd64_v6.12.96_generic = 5ec53c5d956c +KERNEL_COMMIT_amd64_v6.18.46_generic = daa483f487da KERNEL_COMMIT_arm64_v5.10.192_nvidia-jp5 = 2e0dcfd3260d KERNEL_COMMIT_arm64_v5.15.136_nvidia-jp6 = 4929f15eda41 KERNEL_COMMIT_arm64_v6.1.155_generic = 417a12ac3d50 diff --git a/kernel-version.mk b/kernel-version.mk index 21b9e321eca..4f798a3baed 100644 --- a/kernel-version.mk +++ b/kernel-version.mk @@ -2,12 +2,13 @@ # SPDX-License-Identifier: Apache-2.0 # # This file is included by the main Makefile. -# Four variables are used as input for the kernel build: +# Five variables are used as input for the kernel build: # ZARCH - architecture (amd64, arm64) # PLATFORM - platform (generic, nvidia, rt, imx*) based on these two # variables we set kernel version, commit hash and branch # when new kernel is built and pushed to the corresponding # dockerhub +# HV - hypervisor (kvm, k, xen, mini) # KERNEL_COMMIT_xxx variable must be manually updated # KERNEL_CONFIG_FLAVOR - optional, used to select kernel's docker tag # which corresponds to the kernel config file @@ -35,10 +36,12 @@ ifeq (, $(filter $(PLATFORM), $(PLATFORMS_$(ZARCH)))) endif ifeq ($(ZARCH), amd64) - KERNEL_VERSION=v6.12.96 + KERNEL_VERSION=v6.18.46 KERNEL_FLAVOR=generic ifeq ($(PLATFORM), rt) KERNEL_CONFIG_FLAVOR=rt + else ifeq ($(HV), k) + KERNEL_CONFIG_FLAVOR=hwe else KERNEL_CONFIG_FLAVOR=core endif