[1/2] CI: update for meta-zephyr changes

Message ID 20220124174012.3916927-1-ross.burton@arm.com
State New
Headers show
Series [1/2] CI: update for meta-zephyr changes | expand

Commit Message

Ross Burton Jan. 24, 2022, 5:40 p.m. UTC
As of meta-zephyr dde88ba the layer is structured different, split into
meta-zephyr-core and meta-zephyr-bsp.

As we define our own machines for use with Zephyr, we can just use
meta-zephyr-core.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ci/meta-zephyr.yml    | 3 ++-
 ci/qemu-cortex-m3.yml | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Jon Mason Jan. 24, 2022, 7:53 p.m. UTC | #1
On Mon, 24 Jan 2022 17:40:11 +0000, Ross Burton wrote:
> As of meta-zephyr dde88ba the layer is structured different, split into
> meta-zephyr-core and meta-zephyr-bsp.
> 
> As we define our own machines for use with Zephyr, we can just use
> meta-zephyr-core.

Applied, thanks!

[1/2] CI: update for meta-zephyr changes
      commit: 710cf290b572ff75d577e587e9b6cfaa0917269f
[2/2] CI: fix check-layer indeterminism
      commit: d2c5a5d289bf89eb58fa565a0836d899df2bf8bc

Best regards,

Patch

diff --git a/ci/meta-zephyr.yml b/ci/meta-zephyr.yml
index 2f23f2bc..20d54649 100644
--- a/ci/meta-zephyr.yml
+++ b/ci/meta-zephyr.yml
@@ -6,4 +6,5 @@  header:
 repos:
   meta-zephyr:
     url: https://git.yoctoproject.org/git/meta-zephyr
-    refspec: master
+    layers:
+      meta-zephyr-core:
diff --git a/ci/qemu-cortex-m3.yml b/ci/qemu-cortex-m3.yml
index ab6d5c73..d9b197cb 100644
--- a/ci/qemu-cortex-m3.yml
+++ b/ci/qemu-cortex-m3.yml
@@ -4,6 +4,11 @@  header:
     - ci/base.yml
     - ci/meta-zephyr.yml
 
+repos:
+  meta-zephyr:
+    layers:
+      meta-zephyr-bsp:
+
 local_conf_header:
   tclibc: |
     TCLIBC = "newlib"