From f08f284e7c86f840c7c4046b48c1def1e9dd67e6 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Mon, 28 Aug 2023 09:03:28 +0000
Subject: [PATCH] Integrate gitlab-ci/combine-to-build-pipeline-yml
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b2fb3e93b33a2cb14b50d30bf02c03f23b20c391
Combine build-yocto.yml and and build-common.yml to build-pipeline.yml
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 26 +++++++++++++-------------
default.xml | 8 ++++----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index e6808701..b2fb3e93 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit e6808701407e3f72e97c3098657846cc901e5e9b
+Subproject commit b2fb3e93b33a2cb14b50d30bf02c03f23b20c391
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bcf788a..748f3113 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: e6808701407e3f72e97c3098657846cc901e5e9b
+ ref: b2fb3e93b33a2cb14b50d30bf02c03f23b20c391
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: e6808701407e3f72e97c3098657846cc901e5e9b
+ GITLAB_CI_REVISION: b2fb3e93b33a2cb14b50d30bf02c03f23b20c391
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index c10bf01a..5f3efd7a 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "4732dffd93a9be357c9ad97d341d1de4d2ccda1e"
-SRCREV_pn-gfeeprom = "33bd49316509ee89a13e62e1c83a112c1ecb4e49"
+SRCREV_pn-gf-productiontests = "dabd46191569d661bc1291964be5e295e61924a6"
+SRCREV_pn-gfeeprom = "48d446b45be972dad98529c2e761eb1b609e50f2"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "9611a35c39e2a4c1f336e7d3b3eab8393c5381d9"
-SRCREV_pn-ltp-guf-tests = "e6be0d0964d429b311bbb6b784ae0d8c530cb51b"
-SRCREV_pn-touchcal-conv = "98c784b040a093db632fb3a1e8f29cf8431d503f"
-SRCREV_pn-gfxml2dto = "800636b1ef5747a1e76bcea764052f593368abc5"
-SRCREV_pn-egalaxi2c = "bfd4c23d74fde9d25a12f46f8731dd5c7d7279ac"
-SRCREV_pn-gfplatdetect = "b7b515e50314157d2ca3fa252a954564a4c597aa"
-SRCREV_pn-xconfig = "e5dddd8af35ce66623b127a7e657160548e30be3"
-SRCREV_pn-linux-guf = "9465ec72ee0276173f76359307b747e3e5bc95c0"
-SRCREV_pn-linux-imx-kuk = "9aa3f484d334ac4dacfcb3ad390f4b921548dde0"
-SRCREV_pn-u-boot-imx = "b77cd6dd1341bb025d7f8b796b7aaa7b8c90c28d"
-SRCREV_pn-qt-multi-screen-compositor = "f2d4686a124bc0affd7631201ee38d490189f230"
+SRCREV_pn-libmdb = "f3cf4ea30d93e6bf3487eecb864025a4fc5beb58"
+SRCREV_pn-ltp-guf-tests = "348970e0123560971374dda9c78cb56455533525"
+SRCREV_pn-touchcal-conv = "1c11892dc2e0a8636ed20838722d0055e77e67ad"
+SRCREV_pn-gfxml2dto = "9bf1ed435f62f96ead34462206fb439324256758"
+SRCREV_pn-egalaxi2c = "38db3289d52279b208fa4ab24b81a0c481481b3f"
+SRCREV_pn-gfplatdetect = "767e85547e0bb3117dedf8a63f10d536094cca8d"
+SRCREV_pn-xconfig = "a6f459e0909e14d70ff7a29df1c3580eaed23527"
+SRCREV_pn-linux-guf = "c72fe7e25f9ed5bec429cba4d32940c58908ff90"
+SRCREV_pn-linux-imx-kuk = "70a562007b142af039b547951faed95d286e8232"
+SRCREV_pn-u-boot-imx = "278604231fd1d91be6b6efc7dd75e4db9355425e"
+SRCREV_pn-qt-multi-screen-compositor = "ab058d173b35f2243b35f230ad37f882b16f5519"
diff --git a/default.xml b/default.xml
index ca8e0949..46ae632b 100644
--- a/default.xml
+++ b/default.xml
@@ -21,10 +21,10 @@
<project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="5a026be5a6b29a27a7754d7fa5d4765c99f98ed9" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" />
- <project name="layers/meta-seconorth-machine" revision="fb893ae701379e3e74d9931c1e52fd7e5c055382" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="cc5b7eb16f4fc3ee06fcabe1c401ea71911be73e" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="5f2173ab27b2701cb0ce796bd67188ef1de74242" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="868fe23742ef62341d76c273aa5658be582d69ea" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="301aeb02557be90c47b26ce0a82d433a88546821" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="2e045847f885fbd71b77c79f9952651d1868fade" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="ef004771326a27323362bf1367a15b84e142598e" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="afe2eacc43e427e458881082bf3f732f79de0980" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab