layer.conf: add honister and kirkstone to compatible release branches

* manifest: Replace OSSystems/meta-gstreamer1.0.git with psaavedra/meta-gstreamer1.0.git because the first one still doesn't support honister * ci: update .gitlab-ci.yml tasks to honister * ci: Add the honister Yocto release manifest Signed-off-by: Pablo Saavedra <[email protected]>
Igalia · Oct 27, 2021 · 2d621d2 · 2d621d2
1 parent 74b6820
commit 2d621d2
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,46 +29,61 @@
   variables:
     # setup-environment targetname machine distro bblayers presets
     # SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2.34
-    # MANIFEST: .gitlab-ci/manifest/manifest-hardknott.xml
+    # MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
     BITBAKE_TARGET: wpewebkit
   script:
     - bitbake $BITBAKE_TARGET
     - rm -rf tmp
 
-hardknott-raspberrypi3-mesa-weston-gtk:
+kirkstone-raspberrypi3-mesa-weston-wpe-2.34:
   extends:
     - .raspberrypi3-mesa-weston-wpe
   allow_failure: true
   variables:
-    MANIFEST: .gitlab-ci/manifest/manifest-hardknott.xml
+    MANIFEST: .gitlab-ci/manifest/manifest-kirkstone.xml
+    SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2_34
+
+honister-raspberrypi3-mesa-weston-gtk:
+  extends:
+    - .raspberrypi3-mesa-weston-wpe
+  allow_failure: true
+  variables:
+    MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
     SOURCE: raspberrypi3-mesa-webkitgtk raspberrypi3-mesa poky raspberrypi ""
     BITBAKE_TARGET: webkitgtk
 
-hardknott-raspberrypi3-mesa-weston-wpe-musl:
+honister-raspberrypi3-mesa-weston-wpe-musl:
   extends:
     - .raspberrypi3-mesa-weston-wpe
   allow_failure: true
   variables:
-    MANIFEST: .gitlab-ci/manifest/manifest-hardknott.xml
+    MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
     SOURCE: raspberrypi3-mesa-wpe-musl raspberrypi3-mesa poky raspberrypi mesa-wpe-2_34
   script:
     - TCLIBC=musl bitbake $BITBAKE_TARGET
     - rm -rf tmp
 
-hardknott-raspberrypi3-mesa-weston-wpe-qt:
+honister-raspberrypi3-mesa-weston-wpe-qt:
   extends:
     - .raspberrypi3-mesa-weston-wpe
   allow_failure: true
   variables:
-    MANIFEST: .gitlab-ci/manifest/manifest-hardknott.xml
+    MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
     SOURCE: raspberrypi3-mesa-wpe-qt raspberrypi3-mesa poky qt5 mesa-wpe-qt
 
-hardknott-raspberrypi3-mesa-weston-wpe-2.34:
+honister-raspberrypi3-mesa-weston-wpe-2.32:
   extends:
     - .raspberrypi3-mesa-weston-wpe
   variables:
-    MANIFEST: .gitlab-ci/manifest/manifest-hardknott.xml
-    SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2_32
+    MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
+    SOURCE: raspberrypi3-mesa-wpe-2.32 raspberrypi3-mesa poky raspberrypi mesa-wpe-2_32
+
+honister-raspberrypi3-mesa-weston-wpe-2.34:
+  extends:
+    - .raspberrypi3-mesa-weston-wpe
+  variables:
+    MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
+    SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2_34
 
 hardknott-raspberrypi3-mesa-weston-wpe-2.34:
   extends:

diff --git a/.gitlab-ci/manifest/manifest-honister.xml b/.gitlab-ci/manifest/manifest-honister.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <default sync-j="2"/>
+
+  <remote fetch="https://git.openembedded.org/" name="oe"/>
+  <remote fetch="https://git.yoctoproject.org/git/" name="yocto"/>
+  <remote fetch="https://github.com" name="github"/>
+  <remote fetch="https://github.com/Igalia" name="igalia"/>
+  <remote fetch="https://gitlab.com" name="gitlab"/>
+  <remote fetch="http://code.qt.io/yocto" name="qt"/>
+
+  <project remote="oe" revision="honister" name="meta-openembedded" path="sources/meta-openembedded"/>
+  <project remote="oe" revision="honister" name="meta-python2" path="sources/meta-python2"/>
+
+  <project remote="yocto" revision="honister" name="poky" path="sources/poky"/>
+  <project remote="yocto" revision="master" name="meta-raspberrypi" path="sources/meta-raspberrypi"/>
+
+  <project remote="github" revision="psaavedra/add_honister" name="psaavedra/meta-gstreamer1.0.git" path="sources/meta-gstreamer1.0"/>
+
+  <project remote="qt" revision="upstream/honister" name="meta-qt5.git" path="sources/meta-qt5"/>
+
+  <project remote="igalia" revision="main" name="meta-webkit.git" path="sources/meta-webkit"/>
+</manifest>
diff --git a/.gitlab-ci/manifest/manifest-kirkstone.xml b/.gitlab-ci/manifest/manifest-kirkstone.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <default sync-j="2"/>
+
+  <remote fetch="https://git.openembedded.org/" name="oe"/>
+  <remote fetch="https://git.yoctoproject.org/git/" name="yocto"/>
+  <remote fetch="https://github.com" name="github"/>
+  <remote fetch="https://github.com/Igalia" name="igalia"/>
+  <remote fetch="https://gitlab.com" name="gitlab"/>
+  <remote fetch="http://code.qt.io/yocto" name="qt"/>
+
+  <project remote="oe" revision="master" name="meta-openembedded" path="sources/meta-openembedded"/>
+  <project remote="oe" revision="master" name="meta-python2" path="sources/meta-python2"/>
+
+  <project remote="yocto" revision="master" name="poky" path="sources/poky"/>
+  <project remote="yocto" revision="master" name="meta-raspberrypi" path="sources/meta-raspberrypi"/>
+
+  <project remote="github" revision="psaavedra/add_kirkstone" name="psaavedra/meta-gstreamer1.0.git" path="sources/meta-gstreamer1.0"/>
+
+  <project remote="qt" revision="upstream/master" name="meta-qt5.git" path="sources/meta-qt5"/>
+
+  <project remote="igalia" revision="main" name="meta-webkit.git" path="sources/meta-webkit"/>
+</manifest>
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -16,5 +16,5 @@ BBFILE_PRIORITY_webkit = "7"
 # do not error out on bbappends for missing recipes
 BB_DANGLINGAPPENDS_WARNONLY = "true"
 
-# Support the current actively  maintained Yocto releases
-LAYERSERIES_COMPAT_webkit = "dunfell gatesgarth hardknott"
+# Support from the current actively maintained LTS Yocto release
+LAYERSERIES_COMPAT_webkit = "dunfell gatesgarth hardknott honister kirkstone"