diff mbox series

[4/8] CI: apply a patch so that meta-zephyr is compatible with kirkstone

Message ID 20220225050803.2517279-4-jon.mason@arm.com
State New
Headers show
Series [1/8] arm-toolchain/external-arm-toolchain: fix missing license updates | expand

Commit Message

Jon Mason Feb. 25, 2022, 5:07 a.m. UTC 
From: Ross Burton <ross.burton@arm.com>

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...-kirkstone-to-layer-compatible-lists.patch | 49 +++++++++++++++++++
 ci/meta-zephyr.yml                            |  4 ++
 2 files changed, 53 insertions(+)
 create mode 100644 0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch
diff mbox series

Patch

diff --git a/0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch b/0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch
new file mode 100644
index 000000000000..8476e0ac37bb
--- /dev/null
+++ b/0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch
@@ -0,0 +1,49 @@ 
+From b49ad47797c6364b351ffdac6ff8c627368962c3 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+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 <ross.burton@arm.com>
+---
+ 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 bdd0e2bbb9c6..5675cc0eb4f9 100644
--- a/ci/meta-zephyr.yml
+++ b/ci/meta-zephyr.yml
@@ -8,6 +8,10 @@  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