From 2d621d2cf2563e43f0f08a03c635bde35d29e225 Mon Sep 17 00:00:00 2001 From: Pablo Saavedra Date: Fri, 17 Sep 2021 19:56:21 +0200 Subject: [PATCH] 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 --- .gitlab-ci.yml | 35 +++++++++++++++------- .gitlab-ci/manifest/manifest-honister.xml | 23 ++++++++++++++ .gitlab-ci/manifest/manifest-kirkstone.xml | 23 ++++++++++++++ conf/layer.conf | 4 +-- 4 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 .gitlab-ci/manifest/manifest-honister.xml create mode 100644 .gitlab-ci/manifest/manifest-kirkstone.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a215b110..40f4b068 100644 --- 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 new file mode 100644 index 00000000..c9e643c7 --- /dev/null +++ b/.gitlab-ci/manifest/manifest-honister.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitlab-ci/manifest/manifest-kirkstone.xml b/.gitlab-ci/manifest/manifest-kirkstone.xml new file mode 100644 index 00000000..8be05582 --- /dev/null +++ b/.gitlab-ci/manifest/manifest-kirkstone.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/layer.conf b/conf/layer.conf index 98dd4d71..e35e733b 100644 --- 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"