From 0d59423263be43f22cf8d597a6da4ec5f2d7f142 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 9 May 2022 17:53:46 -0400 Subject: meta-agl-bsp: update virtio-aarch64 Updates to get the virtio-aarch64 machine building after the upgrade to Yocto Project 4.0 / kirkstone: - Switch to the 5.15 linux-yocto kernel and drop the local backport of the 5.10 recipe. - Fix override syntax in the machine-specific linux-yocto bbappend. - Remove all the patches applied for the virtio and virtio-snd configuration fragments, they seem to have all been applied upstream. Bug-AGL: SPEC-4356 Signed-off-by: Scott Murray Change-Id: I96d4bb9b04d74280d1a3767fe17284fe6049fcba Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27465 Reviewed-by: Vasyl Vavrychuk Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/conf/machine/include/virtio.inc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'meta-agl-bsp/conf/machine/include') diff --git a/meta-agl-bsp/conf/machine/include/virtio.inc b/meta-agl-bsp/conf/machine/include/virtio.inc index 8ee71a80b..6f8a638a0 100644 --- a/meta-agl-bsp/conf/machine/include/virtio.inc +++ b/meta-agl-bsp/conf/machine/include/virtio.inc @@ -16,19 +16,8 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" # Use newer kernel -PREFERRED_VERSION_linux-yocto = "5.10.%" - -# Clear since it is set to 'sllin' in packagegroup-agl-demo.bb, and sllin is not -# compatible with kernel 5.10 at the moment. -LIN_DRIVERS = "" - -# Clear since it is set to 'lttng-modules' in packagegroup-core-tools-profile.bb, -# and lttng-modules are not compatible with 5.10 kernel used for virtio. -LTTNGMODULES:virtio-all = "" +PREFERRED_VERSION_linux-yocto = "5.15.%" EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" IMAGE_CLASSES += "qemuboot" - -# most driver fails to compile -MOST_DRIVERS ?= "" -- cgit 1.2.3-korg