From dcc46d606b2ef499910ec44100329cc309fdea37 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Thu, 14 Sep 2023 12:01:54 +0000
Subject: [PATCH] Integrate gitlab-ci/remove-parsing-of-testdata-in-package and
3 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/45f2aca73b8c48f0c456030d884c7d4c0c4deda0
Refactoring: remove parsing of testdata.json in package stage
Extract and save these variables in the build stage instead and
explicitly pass them as arguments to the package script.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8ca2487d06d3310ccd8af5a4fe7ee07587d64cb0
Move .simulate_build below .build_yocto
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2808f067698773ff2838963ab12ddb33028a33b7
Fix build.env contents for simulated build
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/73d00715cede8e07a38bd903fcf0e244c748db7c
Pretty print release metadata JSON file
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 24 ++++++++++++------------
default.xml | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index f2a29f53..45f2aca7 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
+Subproject commit 45f2aca73b8c48f0c456030d884c7d4c0c4deda0
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50e02b86..628048b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
+ ref: 45f2aca73b8c48f0c456030d884c7d4c0c4deda0
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
+ GITLAB_CI_REVISION: 45f2aca73b8c48f0c456030d884c7d4c0c4deda0
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 3e27c0a5..98869bb7 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "996924ef61717b2b8f38b5e4834e46c6b82d0de6"
-SRCREV_pn-gfeeprom = "c0c698794bcc66e5f8d959bedd288bf68b100a66"
+SRCREV_pn-gf-productiontests = "1d265bba706f5bc42d270618135627ea4a8444e0"
+SRCREV_pn-gfeeprom = "4ee791b8d63a132e18c376cf1c9e190e9137baf2"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "a5cc7f528ce5c9af49b0ede57a08238c0c1dc91f"
-SRCREV_pn-ltp-guf-tests = "95441fa230054f09f3f98a538e95d236bf12ec8e"
-SRCREV_pn-touchcal-conv = "ba8918ad8596f151725f3eefd29bf0496d09d1a8"
-SRCREV_pn-gfxml2dto = "dab1536c500bff238c16f0d32fc87520d109f8d9"
-SRCREV_pn-egalaxi2c = "5bb16840e815553130bdccbb3740f5b92de43b6a"
-SRCREV_pn-gfplatdetect = "bb1c457c9b600083ace7e2c64f7a83150063d6ed"
-SRCREV_pn-xconfig = "457bda3e701d18b096556edeb6031c035f390104"
-SRCREV_pn-linux-guf = "2e008cb0df1b5509d97e7c46973221e20dd16ea9"
-SRCREV_pn-linux-imx-kuk = "bb12a70a0788e788ef0354ab3ab99abf66b5e8d3"
+SRCREV_pn-libmdb = "b0e03595faf5c4878bbe993cfd56d5d48f1460c1"
+SRCREV_pn-ltp-guf-tests = "c18b429d2466c710517ab63e71971577e089cda9"
+SRCREV_pn-touchcal-conv = "4cff4f69ccff1da9ca616ac00a1c712f88f05b58"
+SRCREV_pn-gfxml2dto = "db679241c03f1d4175441c5f9a1a179423effda1"
+SRCREV_pn-egalaxi2c = "0077c9c1c8211c3e9c0b7f48836f03576ab35df2"
+SRCREV_pn-gfplatdetect = "8cb73685629d40025de24d4d0f34d466e65d2120"
+SRCREV_pn-xconfig = "3ad4b2289c2705716359a8b43cbc2cca0cfd96b3"
+SRCREV_pn-linux-guf = "080bb9e192eafa797a4de1ab36b7dcf2bb1fade3"
+SRCREV_pn-linux-imx-kuk = "6d1d151055a014fbcbdb5d52c30c94b35d6754e2"
SRCREV_pn-u-boot-imx = "a89b445ae46842ee508773052110807528403a47"
-SRCREV_pn-qt-multi-screen-compositor = "de1194a3172b6f131859a29d8278d166dd9700e9"
+SRCREV_pn-qt-multi-screen-compositor = "9d168e3145a13f7e629fad8441d5d65d8bf05c6b"
diff --git a/default.xml b/default.xml
index f102c1a7..6865226d 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="1fafc8d41b8914910a04e472b6be04f7f0db7850" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="b6870f93b07cfbbdba16d0d3d15d7572aab2c16e" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="6442065cb7d4bd521a182049c5fbbd75ac478a40" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="f3e9e781842eb89c155cad4af69844bae931a2e5" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="9ddd0ffa27e9ae0610ec4ede27f47452513d4c35" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="ab5cbf156a99ce321a584d0d3f98d99a41631604" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="d7575f7987f5efc74e5800fbfd1739b1e91d381c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="46886ef3b6393d647af3e9ae0b5814fbe99d5155" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab