diff --git a/0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch b/0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch deleted file mode 100644 index 8476e0ac..00000000 --- a/0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b49ad47797c6364b351ffdac6ff8c627368962c3 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 23 Feb 2022 13:39:39 +0000 -Subject: [meta-zephyr][PATCH] layer.conf: add kirkstone to layer compatible - lists - -Add Kirkstone to the layer compatbility list now that oe-core master -only support kirkstone. - -Many variables were renamed in oe-core, but as none of them are used in -meta-zephyr this layer can remain compatible with older layers too. - -Signed-off-by: Ross Burton ---- - meta-zephyr-bsp/conf/layer.conf | 4 ++-- - meta-zephyr-core/conf/layer.conf | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/meta-zephyr-bsp/conf/layer.conf b/meta-zephyr-bsp/conf/layer.conf -index d5d478c..507374f 100644 ---- a/meta-zephyr-bsp/conf/layer.conf -+++ b/meta-zephyr-bsp/conf/layer.conf -@@ -15,6 +15,6 @@ LAYERVERSION_zephyrbsp = "1" - - LAYERDEPENDS_zephyrbsp = "zephyrcore core meta-python" - --LAYERSERIES_COMPAT_zephyrbsp = "dunfell gatesgarth hardknott honister" -+LAYERSERIES_COMPAT_zephyrbsp = "dunfell gatesgarth hardknott honister kirkstone" - --X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}" -+X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone', 'include/x86', 'include', d)}" -diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf -index d3ac10e..20c8fdf 100644 ---- a/meta-zephyr-core/conf/layer.conf -+++ b/meta-zephyr-core/conf/layer.conf -@@ -15,8 +15,8 @@ LAYERVERSION_zephyrcore = "1" - - LAYERDEPENDS_zephyrcore = "core meta-python" - --LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister" -+LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister kirkstone" - --X86_TUNE_DIR = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'honister', 'include/x86', 'include', d)}" -+X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone', 'include/x86', 'include', d)}" - - PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages" --- -2.25.1 - diff --git a/ci/meta-zephyr.yml b/ci/meta-zephyr.yml index 5675cc0e..bdd0e2bb 100644 --- a/ci/meta-zephyr.yml +++ b/ci/meta-zephyr.yml @@ -8,10 +8,6 @@ repos: url: https://git.yoctoproject.org/git/meta-zephyr layers: meta-zephyr-core: - patches: - kirkstone: - repo: meta-arm - path: 0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch target: - zephyr-kernel-test-all