From 6ce1712917eeaa66dc138506c1d5146a78bf75b1 Mon Sep 17 00:00:00 2001 From: Vasyl Vavrychuk Date: Fri, 16 Apr 2021 13:01:41 +0000 Subject: [PATCH] virtualization/linux-yocto: Reorganize layout of linux-yocto kernel virtio metadata. Follow layout of yocto-kernel-cache, this makes code a little bit more understandable and familiar for one who worked with yocto-kernel-cache. Change-Id: I1ad65039a1738b928069d035d485e2728e8a55b2 Bug-AGL: SPEC-3893 Signed-off-by: Vasyl Vavrychuk Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26287 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../linux-yocto/{virtio-aarch64 => virtio-kmeta/arch/arm}/aarch64.cfg | 0 .../linux-yocto/{virtio-aarch64 => virtio-kmeta/arch/arm}/aarch64.scc | 0 .../bsp/virtio}/virtio-aarch64-standard.scc | 2 +- .../{virtio-aarch64 => virtio-kmeta/bsp/virtio}/virtio.cfg | 0 .../{virtio-aarch64 => virtio-kmeta/bsp/virtio}/virtio.scc | 0 .../virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) rename meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/{virtio-aarch64 => virtio-kmeta/arch/arm}/aarch64.cfg (100%) rename meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/{virtio-aarch64 => virtio-kmeta/arch/arm}/aarch64.scc (100%) rename meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/{virtio-aarch64 => virtio-kmeta/bsp/virtio}/virtio-aarch64-standard.scc (90%) rename meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/{virtio-aarch64 => virtio-kmeta/bsp/virtio}/virtio.cfg (100%) rename meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/{virtio-aarch64 => virtio-kmeta/bsp/virtio}/virtio.scc (100%) diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/aarch64.cfg b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/arch/arm/aarch64.cfg similarity index 100% rename from meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/aarch64.cfg rename to meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/arch/arm/aarch64.cfg diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/aarch64.scc b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/arch/arm/aarch64.scc similarity index 100% rename from meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/aarch64.scc rename to meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/arch/arm/aarch64.scc diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio-aarch64-standard.scc b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc similarity index 90% rename from meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio-aarch64-standard.scc rename to meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc index 3a241a0ee..e77375905 100644 --- a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio-aarch64-standard.scc +++ b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc @@ -4,7 +4,7 @@ define KTYPE standard define KARCH arm64 include ktypes/standard/standard.scc -include aarch64.scc +include arch/arm/aarch64.scc include cfg/8250.scc include cfg/virtio.scc include virtio.scc diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio.cfg b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio.cfg similarity index 100% rename from meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio.cfg rename to meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio.cfg diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio.scc b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio.scc similarity index 100% rename from meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-aarch64/virtio.scc rename to meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio.scc diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend index ed48a1359..5e613a616 100644 --- a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" -SRC_URI_append_virtio-aarch64 = " \ - file://virtio-aarch64;type=kmeta;destsuffix=virtio-aarch64 \ +SRC_URI_append_virtio-all = " \ + file://virtio-kmeta;type=kmeta;destsuffix=virtio-kmeta \ " COMPATIBLE_MACHINE_virtio-aarch64 = "virtio-aarch64" -- 2.16.6