From 0164b4ca7adaa2946890ffedc67101c3e4e8ed7f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 3 Oct 2022 23:33:19 -0400 Subject: [PATCH] Revert "CI: apply a patch so that meta-zephyr is compatible with langdale" This reverts commit b64ea83aef1b5243ae1ad0f67c471f6abdb59892. --- 0001-layers-add-langdale-compatibility.patch | 42 -------------------- ci/meta-zephyr.yml | 4 -- 2 files changed, 46 deletions(-) delete mode 100644 0001-layers-add-langdale-compatibility.patch diff --git a/0001-layers-add-langdale-compatibility.patch b/0001-layers-add-langdale-compatibility.patch deleted file mode 100644 index 034864e0..00000000 --- a/0001-layers-add-langdale-compatibility.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6eb21b8c40daa9049c68787b0e6ed841e8f2d07c Mon Sep 17 00:00:00 2001 -From: Jon Mason -Date: Thu, 29 Sep 2022 18:09:02 -0400 -Subject: [PATCH] layers: add langdale compatibility - -Signed-off-by: Jon Mason ---- - 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 507374f206b0..cbbaafe2a8dc 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 kirkstone" -+LAYERSERIES_COMPAT_zephyrbsp = "dunfell gatesgarth hardknott honister kirkstone langdale" - --X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone', 'include/x86', 'include', d)}" -+X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone langdale', 'include/x86', 'include', d)}" -diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf -index 20c8fdf93a83..3d1e57b13897 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 kirkstone" -+LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister kirkstone langdale" - --X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone', 'include/x86', 'include', d)}" -+X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone langdale', 'include/x86', 'include', d)}" - - PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages" --- -2.30.2 - diff --git a/ci/meta-zephyr.yml b/ci/meta-zephyr.yml index 211f2e32..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: - langdale: - repo: meta-arm - path: 0001-layers-add-langdale-compatibility.patch target: - zephyr-kernel-test-all