ci: switch to scarthgap 5.0.2 baseline for poky

Switch to the scarthgap 5.0 baseline for poky. Include meta-yocto-bsp to get the genericarm64 machine. Signed-off-by: Bill Mills <[email protected]>
OpenAMP · Jul 5, 2024 · 83f4067 · 83f4067
1 parent 77fba23
commit 83f4067
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ci/openamp.yml b/ci/openamp.yml
@@ -12,10 +12,12 @@ repos:
   layers/poky:
     url: https://git.yoctoproject.org/git/poky
     # Known good master as of 2023-10-05
-    refspec: 2b9044361f2855866eed831f8bdb770f2c7d42dc
+    # refspec: 2b9044361f2855866eed831f8bdb770f2c7d42dc
+    refspec: yocto-5.0.1
     layers:
       meta:
       meta-poky:
+      meta-yocto-bsp:
   layers/meta-openamp:
     url: https://github.com/openamp/meta-openamp.git
     refspec: master

diff --git a/layers/meta-openamp-bsp/conf/layer.conf b/layers/meta-openamp-bsp/conf/layer.conf
@@ -12,10 +12,12 @@ LAYERVERSION_openampbsp = "4"
 
 # meta-openamp upstream master branch supports:
 # = POLICY ======== CURRENT RELEASE ===
-# master            nanbield    YP 4.3 2023/10
-# latest release    mickledore  YP 4.2 2023/04
-# LTS               kirkstone   YP 4.0 2022/04
+# master            styhead     YP 5.1 2024/10
+# current release   (same as LTS)
+# LTS               scarthgap   YP 5.0 2024/04
+# LTS-1             kirkstone   YP 4.0 2022/04
 #
-# Upstream also supports the following via the appropriate branch:
-# (LTS-1)           none for now
-LAYERSERIES_COMPAT_openampbsp = "kirkstone mickledore nanbield"
+# Supported for transition debug only
+# previous release  nanbield    YP 4.3 2023/10
+
+LAYERSERIES_COMPAT_openampbsp = "styhead scarthgap kirkstone nanbield"