From 965982dc7b73df81a0473d66e67314d95ffd2379 Mon Sep 17 00:00:00 2001 From: Sam Dolt Date: Thu, 21 Mar 2024 15:18:19 +0100 Subject: [PATCH] feat(vm-x64): update kernel to 6.6 --- layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf | 2 +- .../conf/machine/include/coreos-generic-machine/vm.inc | 2 +- .../recipes-kernel/linux/linux-yocto_6.6.bbappend | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf b/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf index 156dda8..e2330e9 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf +++ b/layers/meta-belden-coreos-bsp/conf/machine/beaglebone.conf @@ -12,7 +12,7 @@ include conf/machine/include/arm/armv7a/tune-cortexa8.inc IMAGE_FSTYPES += "wic wic.xz wic.bmap" WKS_FILE ?= "beaglebone-sdcard.wks.in" COREOS_INSTALLER_WKS_FILE ?= "beaglebone-sdcard-installer.wks" -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image kernel-devicetree" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image" do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot gptfdisk-native:do_populate_sysroot virtual/bootloader:do_deploy" do_image_wic[recrdeptask] += "do_bootimg" diff --git a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc index c4a45d2..be9f36e 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc +++ b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/vm.inc @@ -6,7 +6,7 @@ MACHINE_FEATURES += "wifi efi" # Add an override that work for all pc image MACHINEOVERRIDES =. "vm:" -PREFERRED_VERSION_linux-yocto ?= "5.15%" +PREFERRED_VERSION_linux-yocto ?= "6.6%" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware" diff --git a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend index be7465b..da6a60f 100644 --- a/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend +++ b/layers/meta-belden-coreos-bsp/recipes-kernel/linux/linux-yocto_6.6.bbappend @@ -6,6 +6,11 @@ COMPATIBLE_MACHINE:eagle40-03 = "eagle40-03" KMACHINE:beaglebone ?= "beaglebone" COMPATIBLE_MACHINE:beaglebone = "beaglebone" +KMACHINE:vm-x64 ?= "common-pc-64" +COMPATIBLE_MACHINE:vm-x64 = "vm-x64" +KERNEL_FEATURES:append:vm-x64=" cfg/virtio.scc cfg/paravirt_kvm.scc" +SRC_URI:append:vm-x64 = " file://hyperv.cfg" + require ${@bb.utils.contains("COMBINED_FEATURES", "efi", "linux-yocto-coreos-efi.inc", "", d)} SRC_URI += " file://eagle40-03.cfg"