From 95051638dc19a49384ee8f0f9f1b468df49aca54 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 1 May 2024 15:11:07 -0400 Subject: meta-agl-bsp: update meta-virtualization bbappends Rename the meta-virtualization dynamically applied bbappends to handle the newer versions in YP 5.0 / scarthgap. To some degree these changes are placeholders to facilitate building the IC EG container demo images, as the configuration for that pulls in meta-virtualization. The virtio support related changes the bbappends apply here need to be reworked to be actually workable for the KVM demo images and potential downstream users. Bug-AGL: SPEC-5123 Change-Id: I473fa4a64837cedd704f8fb2e7cbd52fa2114d21 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29879 ci-image-build: Jenkins Job builder account Reviewed-by: Naoto YAMAGUCHI Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller ci-image-boot-test: Jenkins Job builder account --- .../recipes-graphics/mesa/mesa_22.%.bbappend | 3 --- .../recipes-graphics/mesa/mesa_24.%.bbappend | 3 +++ .../recipes-kernel/linux/linux-yocto_5.15.bbappend | 17 ----------------- .../recipes-kernel/linux/linux-yocto_6.6.bbappend | 17 +++++++++++++++++ 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_22.%.bbappend create mode 100644 meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend delete mode 100644 meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend create mode 100644 meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_6.6.bbappend (limited to 'meta-agl-bsp') diff --git a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_22.%.bbappend deleted file mode 100644 index 0a6606ebf..000000000 --- a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_22.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch" diff --git a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend new file mode 100644 index 000000000..0a6606ebf --- /dev/null +++ b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch" diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend deleted file mode 100644 index 6952436a3..000000000 --- a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_5.15.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -# Cannot just append to SRC_URI, as the metadata interferes with the -# AGL config fragment scheme -AGL_KERNEL_SRC:prepend:virtio-all = " \ - git://gerrit.automotivelinux.org/gerrit/src/agl-yocto-kernel-meta.git;protocol=https;type=kmeta;name=agl-meta;destsuffix=agl-kernel-meta;branch=kernel-5.15 \ - file://virtio-aarch64-${LINUX_KERNEL_TYPE}.scc \ -" - -SRCREV_agl-meta = "4deb7357eab5962b0553a5ad1f11be5ac35f9da9" - -AGL_KCONFIG_FRAGMENTS:append:virtio-all = " \ - virtio-drm.cfg \ - virtio-pci.cfg \ -" - -COMPATIBLE_MACHINE:virtio-aarch64 = "virtio-aarch64" diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_6.6.bbappend b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_6.6.bbappend new file mode 100644 index 000000000..6952436a3 --- /dev/null +++ b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_6.6.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +# Cannot just append to SRC_URI, as the metadata interferes with the +# AGL config fragment scheme +AGL_KERNEL_SRC:prepend:virtio-all = " \ + git://gerrit.automotivelinux.org/gerrit/src/agl-yocto-kernel-meta.git;protocol=https;type=kmeta;name=agl-meta;destsuffix=agl-kernel-meta;branch=kernel-5.15 \ + file://virtio-aarch64-${LINUX_KERNEL_TYPE}.scc \ +" + +SRCREV_agl-meta = "4deb7357eab5962b0553a5ad1f11be5ac35f9da9" + +AGL_KCONFIG_FRAGMENTS:append:virtio-all = " \ + virtio-drm.cfg \ + virtio-pci.cfg \ +" + +COMPATIBLE_MACHINE:virtio-aarch64 = "virtio-aarch64" -- cgit 1.2.3-korg