From b7ed80f700a04cc73468a2e94b0189fc484f6ba8 Mon Sep 17 00:00:00 2001
From: guf-gitbot <gitbot@garz-fricke.com>
Date: Mon, 4 Apr 2022 10:32:18 +0000
Subject: [PATCH] Integrate gitlab-ci/CI-fix-integration-with-srcrev and 3 more
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
CI: integrate_into_manifest: Fix integration for recipes in SRCREV file
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/976aaec9d9c6ef10defd4b3a7329d366452bd522
CI: deploy_gitlab_ci: Fix merge, integration branch was used after delete
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/65c6f273b63e4d1beca064f6edb3073321fd5cea
CI: Rename foobar to ci-test, like the job names
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/60c311abd4930bf490f13ab13bf2534e160bf842
CI: Reuse existing integration branch preserving manual changes
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
SRCREV.conf | 26 +++++++++++++-------------
default.xml | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 3318487d..ab318978 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 3318487d518476135ce978fe3fa3a113ca29295f
+Subproject commit ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d388acdb..96534bb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 3318487d518476135ce978fe3fa3a113ca29295f
+ ref: ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
file: 'manifest.yml'
diff --git a/SRCREV.conf b/SRCREV.conf
index 4e6cda27..2d68a7ad 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,13 +1,13 @@
-SRCREV_pn-gf-productiontests = "e40f4e102f93565e58dc5ac45aca26a6a584cc71"
-SRCREV_pn-gfeeprom = "64877c1708bb2142851900ea605833ad2f5817ee"
-SRCREV_pn-guf-show-demo = "065938103e645aa8febeabab87d8089635aee301"
-SRCREV_pn-libmdb = "a2394fd92ae9d2f8404ce15cf5c4cafe44011ee8"
-SRCREV_pn-ltp-guf-tests = "2fdacdcd981cf1214ac606b3ec54f9c58225b134"
-SRCREV_pn-touchcal-conv = "fe9fb326d00c68b6eb7b8d89ca6cb820748c275f"
-SRCREV_pn-gfxml2dto = "bb3331e4cc0fe07b2c4f1de04f1e3fbfcb150efa"
-SRCREV_pn-egalaxi2c = "61045718258d312c890c226361f7b6420d857d5b"
-SRCREV_pn-gfplatdetect = "071d42f7cd038adcb5f5429097df5b5f7cfb2ef8"
-SRCREV_pn-xconfig = "2ac3612bec1faef560416bc00ee3dd732ba25c5b"
-SRCREV_pn-linux-guf = "1873664cb3553ea1b34dbe2d120edf29d6e9c641"
-SRCREV_pn-linux-imx-kuk = "5e589e517f0d68b784b33345698193f08cb895a1"
-SRCREV_pn-u-boot-imx = "b66573a77f5bd7cf44fa7cf597c45a03afdf0d9d"
+SRCREV_pn-gf-productiontests = "6766712b33f3792b572de86c4cdbaa5fef9080fe"
+SRCREV_pn-gfeeprom = "a010d0722cd38a638ef411f2a9dce67f70368e85"
+SRCREV_pn-guf-show-demo = "5127a2b45553da6c8b5593f0149097114abbe6b7"
+SRCREV_pn-libmdb = "48089a4978648c35f6147e1b8e0f56f1738ae199"
+SRCREV_pn-ltp-guf-tests = "48a7dae48e2e134c5d54d8269060b34956e3c950"
+SRCREV_pn-touchcal-conv = "436cf5a78a966513d67cf661ee7f379b10e9b3a0"
+SRCREV_pn-gfxml2dto = "6c12d27124af5410ecd3af6978e084952098ba43"
+SRCREV_pn-egalaxi2c = "fb58007ef59b765c8dff6d87806150b58b421b5f"
+SRCREV_pn-gfplatdetect = "e33ea89bb4cd9c6ab6b0e744660dcc44f94ab68d"
+SRCREV_pn-xconfig = "dc527f9e9dba7b3f9598b61db54728c0c8380e5b"
+SRCREV_pn-linux-guf = "5b755bd7303b94557014fd03ca562b87b29e1da0"
+SRCREV_pn-linux-imx-kuk = "864b29a175cfed565b98e9a0f0c9556b84cfbc03"
+SRCREV_pn-u-boot-imx = "f8c10a8bd2b94127fe28cd51186a109a7c46f755"
diff --git a/default.xml b/default.xml
index 71b815b8..b94c88a0 100644
--- a/default.xml
+++ b/default.xml
@@ -23,9 +23,9 @@
<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-guf-machine" revision="8209ad1ce4d80f4553338ea044c598749e471f1b" remote="seco-north" path="sources/meta-guf-machine" />
- <project name="layers/meta-guf-distro" revision="d0977e95d7925b5f4e0b80f9f8af3e25ec4dcd23" remote="seco-north" path="sources/meta-guf-distro" />
- <project name="config" revision="d4da4ca5396241d5f14d73d18b2c69d1ce3b6c4b" remote="seco-north" path=".conf">
+ <project name="layers/meta-guf-machine" revision="d081485e3309f3ce3ae06e5018d2a202c139507c" remote="seco-north" path="sources/meta-guf-machine" />
+ <project name="layers/meta-guf-distro" revision="48557a545b41439aa373eb9b6e59613fd87ab186" remote="seco-north" path="sources/meta-guf-distro" />
+ <project name="config" revision="7f08fde919a3f16e15d76e86f78930f5ecaf0e9a" remote="seco-north" path=".conf">
<linkfile dest="setup-environment" src="setup-environment"/>
</project>
</manifest>
--
GitLab