From 82bcce7ef19e7c63abecc0f13f03551454c6e8ef Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Fri, 17 Sep 2021 21:53:31 +0200
Subject: [PATCH] ci: Remove meta-gstreamer1.0 as required for latest versions
Since hardknott poky provides a recent enough version (1.18.4).
---
.gitlab-ci.yml | 16 ++++++++--------
.gitlab-ci/manifest/manifest-dunfell.xml | 2 --
.gitlab-ci/manifest/manifest-gatesgarth.xml | 4 ----
.gitlab-ci/manifest/manifest-hardknott.xml | 4 ----
.gitlab-ci/manifest/manifest-honister.xml | 2 --
.gitlab-ci/manifest/manifest-kirkstone.xml | 4 ----
...rs.conf.qt5 => bblayers.conf.qt5_honister} | 1 -
...rypi => bblayers.conf.raspberrypi_dunfell} | 0
.../bblayers.conf.raspberrypi_honister | 19 +++++++++++++++++++
9 files changed, 27 insertions(+), 25 deletions(-)
rename .gitlab-ci/template/bblayers/{bblayers.conf.qt5 => bblayers.conf.qt5_honister} (92%)
rename .gitlab-ci/template/bblayers/{bblayers.conf.raspberrypi => bblayers.conf.raspberrypi_dunfell} (100%)
create mode 100644 .gitlab-ci/template/bblayers/bblayers.conf.raspberrypi_honister
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40f4b068..51efa28b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ kirkstone-raspberrypi3-mesa-weston-wpe-2.34:
allow_failure: true
variables:
MANIFEST: .gitlab-ci/manifest/manifest-kirkstone.xml
- SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2_34
+ SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi_honister mesa-wpe-2_34
honister-raspberrypi3-mesa-weston-gtk:
extends:
@@ -58,7 +58,7 @@ honister-raspberrypi3-mesa-weston-wpe-musl:
allow_failure: true
variables:
MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
- SOURCE: raspberrypi3-mesa-wpe-musl raspberrypi3-mesa poky raspberrypi mesa-wpe-2_34
+ SOURCE: raspberrypi3-mesa-wpe-musl raspberrypi3-mesa poky raspberrypi_honister mesa-wpe-2_34
script:
- TCLIBC=musl bitbake $BITBAKE_TARGET
- rm -rf tmp
@@ -69,35 +69,35 @@ honister-raspberrypi3-mesa-weston-wpe-qt:
allow_failure: true
variables:
MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
- SOURCE: raspberrypi3-mesa-wpe-qt raspberrypi3-mesa poky qt5 mesa-wpe-qt
+ SOURCE: raspberrypi3-mesa-wpe-qt raspberrypi3-mesa poky qt5_honister mesa-wpe-qt
honister-raspberrypi3-mesa-weston-wpe-2.32:
extends:
- .raspberrypi3-mesa-weston-wpe
variables:
MANIFEST: .gitlab-ci/manifest/manifest-honister.xml
- SOURCE: raspberrypi3-mesa-wpe-2.32 raspberrypi3-mesa poky raspberrypi mesa-wpe-2_32
+ SOURCE: raspberrypi3-mesa-wpe-2.32 raspberrypi3-mesa poky raspberrypi_honister 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
+ SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi_honister mesa-wpe-2_34
hardknott-raspberrypi3-mesa-weston-wpe-2.34:
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_34
+ SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi_honister mesa-wpe-2_34
gatesgarth-raspberrypi3-mesa-weston-wpe-2.34:
extends:
- .raspberrypi3-mesa-weston-wpe
variables:
MANIFEST: .gitlab-ci/manifest/manifest-gatesgarth.xml
- SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2.34
+ SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi_honister mesa-wpe-2.34
dunfell-raspberrypi3-mesa-weston-wpe-2.34:
extends:
@@ -105,5 +105,5 @@ dunfell-raspberrypi3-mesa-weston-wpe-2.34:
allow_failure: true
variables:
MANIFEST: .gitlab-ci/manifest/manifest-dunfell.xml
- SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi mesa-wpe-2.34
+ SOURCE: raspberrypi3-mesa-wpe-2.34 raspberrypi3-mesa poky raspberrypi_dunfell mesa-wpe-2.34
diff --git a/.gitlab-ci/manifest/manifest-dunfell.xml b/.gitlab-ci/manifest/manifest-dunfell.xml
index 5f8d806d..622a044b 100644
--- a/.gitlab-ci/manifest/manifest-dunfell.xml
+++ b/.gitlab-ci/manifest/manifest-dunfell.xml
@@ -17,7 +17,5 @@
<project remote="github" revision="dunfell" name="OSSystems/meta-gstreamer1.0.git" path="sources/meta-gstreamer1.0"/>
- <project remote="qt" revision="upstream/dunfell" 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-gatesgarth.xml b/.gitlab-ci/manifest/manifest-gatesgarth.xml
index 2b8bdffb..380861b7 100644
--- a/.gitlab-ci/manifest/manifest-gatesgarth.xml
+++ b/.gitlab-ci/manifest/manifest-gatesgarth.xml
@@ -15,9 +15,5 @@
<project remote="yocto" revision="gatesgarth" name="poky" path="sources/poky"/>
<project remote="yocto" revision="gatesgarth" name="meta-raspberrypi" path="sources/meta-raspberrypi"/>
- <project remote="github" revision="gatesgarth" name="OSSystems/meta-gstreamer1.0.git" path="sources/meta-gstreamer1.0"/>
-
- <project remote="qt" revision="upstream/gatesgarth" 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-hardknott.xml b/.gitlab-ci/manifest/manifest-hardknott.xml
index 21ec93b8..f27efd3c 100644
--- a/.gitlab-ci/manifest/manifest-hardknott.xml
+++ b/.gitlab-ci/manifest/manifest-hardknott.xml
@@ -15,9 +15,5 @@
<project remote="yocto" revision="hardknott" name="poky" path="sources/poky"/>
<project remote="yocto" revision="hardknott" name="meta-raspberrypi" path="sources/meta-raspberrypi"/>
- <project remote="github" revision="master" name="OSSystems/meta-gstreamer1.0.git" path="sources/meta-gstreamer1.0"/>
-
- <project remote="qt" revision="upstream/hardknott" 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-honister.xml b/.gitlab-ci/manifest/manifest-honister.xml
index c9e643c7..fff007b2 100644
--- a/.gitlab-ci/manifest/manifest-honister.xml
+++ b/.gitlab-ci/manifest/manifest-honister.xml
@@ -15,8 +15,6 @@
<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"/>
diff --git a/.gitlab-ci/manifest/manifest-kirkstone.xml b/.gitlab-ci/manifest/manifest-kirkstone.xml
index 8be05582..8f137c6b 100644
--- a/.gitlab-ci/manifest/manifest-kirkstone.xml
+++ b/.gitlab-ci/manifest/manifest-kirkstone.xml
@@ -15,9 +15,5 @@
<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/.gitlab-ci/template/bblayers/bblayers.conf.qt5 b/.gitlab-ci/template/bblayers/bblayers.conf.qt5_honister
similarity index 92%
rename from .gitlab-ci/template/bblayers/bblayers.conf.qt5
rename to .gitlab-ci/template/bblayers/bblayers.conf.qt5_honister
index 3ed3c5c6..ddf5c5d8 100644
--- a/.gitlab-ci/template/bblayers/bblayers.conf.qt5
+++ b/.gitlab-ci/template/bblayers/bblayers.conf.qt5_honister
@@ -15,7 +15,6 @@ BBLAYERS = " \
\
${BSPDIR}/sources/meta-raspberrypi \
\
- ${BSPDIR}/sources/meta-gstreamer1.0 \
${BSPDIR}/sources/meta-qt5 \
\
${BSPDIR}/sources/meta-webkit \
diff --git a/.gitlab-ci/template/bblayers/bblayers.conf.raspberrypi b/.gitlab-ci/template/bblayers/bblayers.conf.raspberrypi_dunfell
similarity index 100%
rename from .gitlab-ci/template/bblayers/bblayers.conf.raspberrypi
rename to .gitlab-ci/template/bblayers/bblayers.conf.raspberrypi_dunfell
diff --git a/.gitlab-ci/template/bblayers/bblayers.conf.raspberrypi_honister b/.gitlab-ci/template/bblayers/bblayers.conf.raspberrypi_honister
new file mode 100644
index 00000000..864fce1d
--- /dev/null
+++ b/.gitlab-ci/template/bblayers/bblayers.conf.raspberrypi_honister
@@ -0,0 +1,19 @@
+LCONF_VERSION = "7"
+
+BBPATH = "${TOPDIR}"
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../../..')}"
+
+BBFILES ?= ""
+BBLAYERS = " \
+ ${BSPDIR}/sources/poky/meta \
+ ${BSPDIR}/sources/poky/meta-poky \
+ \
+ ${BSPDIR}/sources/meta-openembedded/meta-oe \
+ ${BSPDIR}/sources/meta-openembedded/meta-python \
+ \
+ ${BSPDIR}/sources/meta-python2 \
+ \
+ ${BSPDIR}/sources/meta-raspberrypi \
+ \
+ ${BSPDIR}/sources/meta-webkit \
+"