From 3bc48de473128739fdbd5e50cd7aad4cd63767fe Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Thu, 16 Mar 2023 12:57:30 +0000 Subject: [PATCH] cassini-bsp: Remove obsolete meta-virtualization patch (N1SDP) meta-arm commit 7c8ce7f5a0d4c56b308d5b0026ce9f278c80820c updates the linux kernel to 6.1 for the N1SDP. The patch to meta-virtualization to retain the 5.19 kernel can now be dropped from meta-cassini. Signed-off-by: Adam Johnston --- ...-restore-recipe-for-Linux-Yocto-5.19.patch | 30 ------------------- meta-cassini-config/kas/n1sdp.yml | 9 ------ 2 files changed, 39 deletions(-) delete mode 100644 meta-cassini-bsp/meta-virtualization/patches/0001-restore-recipe-for-Linux-Yocto-5.19.patch diff --git a/meta-cassini-bsp/meta-virtualization/patches/0001-restore-recipe-for-Linux-Yocto-5.19.patch b/meta-cassini-bsp/meta-virtualization/patches/0001-restore-recipe-for-Linux-Yocto-5.19.patch deleted file mode 100644 index 6466b8a..0000000 --- a/meta-cassini-bsp/meta-virtualization/patches/0001-restore-recipe-for-Linux-Yocto-5.19.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3d8ae1b836fc11354fbc7d1c1cb7eb4abc550fd4 Mon Sep 17 00:00:00 2001 -From: Adam Johnston -Date: Mon, 13 Feb 2023 10:12:06 +0000 -Subject: [PATCH] Restore recipe for Linux Yocto 5.19 - -Switching the Linux kernel to 6.1 in meta-virtualization causes N1SDP -build to fail as it is still on 5.19 in meta-arm. Temporarily restore -5.19 until N1SDP in meta-arm supports 6.1. - -Upstream-Status: Inappropriate -Signed-off-by: Adam Johnston - ---- - recipes-kernel/linux/linux-yocto_5.19_virtualization.inc | 4 ++++ - 1 file changed, 4 insertions(+) - create mode 100644 recipes-kernel/linux/linux-yocto_5.19_virtualization.inc - -diff --git a/recipes-kernel/linux/linux-yocto_5.19_virtualization.inc b/recipes-kernel/linux/linux-yocto_5.19_virtualization.inc -new file mode 100644 -index 0000000..5931148 ---- /dev/null -+++ b/recipes-kernel/linux/linux-yocto_5.19_virtualization.inc -@@ -0,0 +1,4 @@ -+# include the baseline meta virtualization configuration options -+# after this include, we can do version specific things -+ -+include linux-yocto_virtualization.inc --- -2.39.1 - diff --git a/meta-cassini-config/kas/n1sdp.yml b/meta-cassini-config/kas/n1sdp.yml index 57640a3..4c97371 100644 --- a/meta-cassini-config/kas/n1sdp.yml +++ b/meta-cassini-config/kas/n1sdp.yml @@ -8,15 +8,6 @@ header: includes: - meta-cassini-config/kas/include/arm-machines.yml -repos: - meta-virtualization: - patches: - 0001-revert-linux-yocto-6.1: - repo: meta-cassini - path: - "meta-cassini-bsp/meta-virtualization/patches/\ - 0001-restore-recipe-for-Linux-Yocto-5.19.patch" - local_conf_header: n1sdp: | IMAGE_FSTYPES:remove:n1sdp = "wic ext4" -- GitLab