mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-06 14:50:03 +00:00
Code Issues Projects Releases Wiki Activity

CI: apply a patch so that meta-zephyr is compatible with kirkstone

Browse Source 
Signed-off-by: Ross Burton <ross.burton@arm.com>
This commit is contained in:
Ross Burton
2022-02-23 13:44:55 +00:00
parent 19b7bdba9b
commit 7dd00e4d71
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0001-layer.conf-add-kirkstone-to-layer-compatible-lists.patch
+49
View File
@@ -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
ci/meta-zephyr.yml
+4
View File
@@ -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