From 751cc789d9052d4b9ad586191ca4c2f50ad97476 Mon Sep 17 00:00:00 2001 From: Vasyl Vavrychuk Date: Wed, 16 Dec 2020 18:47:15 +0200 Subject: virtualization/linux-yocto: Add virtio-aarch64-standard.scc to SRC_URI. It allows to use patch command to apply patches via scc file. As explained in [1,2], Yocto kernel metadata is commonly used for two purposes: 1. To construct Yocto kernel git by committing patches listed in scc files. 2. To configure Yocto kernel during Yocto build. When scc file is not explicitly added to SRC_URI, then patch commands will be ignored during Yocto build because it is assumed that patches are already pre-applied during Yocto kernel git tree construction. On the other hand, nopatch should be added to standard.scc because patches from it are actually pre-applied. [1]: https://www.yoctoproject.org/pipermail/yocto/2019-October/046986.html [2]: https://docs.yoctoproject.org/kernel-dev/maint-appx.html Change-Id: Id238e79e1b354daaa23e83bef45fc93a216fbf92 Bug-AGL: SPEC-3893 Signed-off-by: Vasyl Vavrychuk Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26288 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc | 2 +- .../virtualization-layer/recipes-kernel/linux/linux-yocto_%.bbappend | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc index e77375905..d675de474 100644 --- a/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc +++ b/meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-aarch64-standard.scc @@ -3,7 +3,7 @@ define KMACHINE virtio-aarch64 define KTYPE standard define KARCH arm64 -include ktypes/standard/standard.scc +include ktypes/standard/standard.scc nopatch include arch/arm/aarch64.scc include cfg/8250.scc include cfg/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 5e613a616..e044af5f3 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 @@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-yocto:" SRC_URI_append_virtio-all = " \ file://virtio-kmeta;type=kmeta;destsuffix=virtio-kmeta \ + file://virtio-kmeta/bsp/virtio/virtio-aarch64-${LINUX_KERNEL_TYPE}.scc \ " COMPATIBLE_MACHINE_virtio-aarch64 = "virtio-aarch64" -- cgit 1.2.3-korg