From 10fe939bdaf26cc4f56557629230d5ca888d78d2 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Mon, 20 Nov 2023 09:52:17 +0000
Subject: [PATCH] Integrate gitlab-ci/generate_firmware_json
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63
build:stages: Add Firmware Package JSON stage
The old Alphaplan stage is deprecated and was removed in a prior commit.
Add new stage to generate the Firmware Package JSON files that do replace
the old Alphaplan articles.
---
.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 1830cb02..51e0cf67 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 1830cb0291a866af5cebeebbfdbac32544f655c7
+Subproject commit 51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 547b5225..6f0ead3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 1830cb0291a866af5cebeebbfdbac32544f655c7
+ ref: 51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: 1830cb0291a866af5cebeebbfdbac32544f655c7
+ GITLAB_CI_REVISION: 51e0cf67dc5961134ef4bd3e7a1b1659ab95dd63
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index f8eb002f..3854975e 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "5e2790c201a558912773a068a5a96103faeba86b"
-SRCREV_pn-gfeeprom = "da61ab599028649901c0f730f0470b3b8cba025c"
+SRCREV_pn-gf-productiontests = "d8b78076b63e6d29b67a8c972bbcf21cc9deb5b6"
+SRCREV_pn-gfeeprom = "bdafc838a9521780e02d1ea775838f98707542cc"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "e315ffb765ccc79f7e8e99285e6b166288dd48aa"
-SRCREV_pn-ltp-guf-tests = "84f6bd7ef05e4ddcd6949944e898b28162a41c04"
-SRCREV_pn-touchcal-conv = "1a80c51a11b0e15b9afca770c3f8977e6b2f9147"
-SRCREV_pn-gfxml2dto = "5a6dba29e1e55882a2e6c6a90f6f606254c6e308"
-SRCREV_pn-egalaxi2c = "6e46126032a6eae45dd7a1d61ea3e4c164611b56"
-SRCREV_pn-gfplatdetect = "a7feeafa2253ed71bbfb1e5af0ba90d8521c4281"
-SRCREV_pn-xconfig = "a18f108913f7dbd87abc1ffb7b278b77510b0034"
-SRCREV_pn-linux-guf = "bf1d6d4075611d01e06563bb8156a6e581111167"
-SRCREV_pn-linux-imx-kuk = "e3a29cfc933242ce728a7e26f5fccffd2944cad7"
+SRCREV_pn-libmdb = "41a64319220875eeeb86da5f0e83ac751d401a40"
+SRCREV_pn-ltp-guf-tests = "f7e9e917c04023cf5c9403976276632489cd2b17"
+SRCREV_pn-touchcal-conv = "4d7785993e34a80ccddeb4c7b56155f62b402522"
+SRCREV_pn-gfxml2dto = "a86c191614493004521b809b877c2d0a351ba55a"
+SRCREV_pn-egalaxi2c = "aa01f6d9c52d0d85add1e9f649deb5eccbb64f11"
+SRCREV_pn-gfplatdetect = "b180cc77dfc6afc47654cd8a404c46f757209c9a"
+SRCREV_pn-xconfig = "de086ef6beac3fe2d4714795fbeccdaeecf09db2"
+SRCREV_pn-linux-guf = "66eac6b7dc9721f98db25bdcaf1e75163d23de9e"
+SRCREV_pn-linux-imx-kuk = "98955fa4eddee16b22d3f6aa8c62e6dfba648210"
SRCREV_pn-u-boot-imx = "a89b445ae46842ee508773052110807528403a47"
-SRCREV_pn-qt-multi-screen-compositor = "5bd914891f2b4dfae5d7f5fe2a147a3ad2201f1a"
+SRCREV_pn-qt-multi-screen-compositor = "6680e57ec5d317d256adebd3afdda08551e34beb"
diff --git a/default.xml b/default.xml
index 5431ae2b..d7cd2db0 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="2584c06b75b03e2e7716b890d70142a7ade68926" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="f3bd508c27fa464453583a553bdd8bfb49145a28" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="3ff347e5801c73e09d82c7d135402245c6cdbca1" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="4238fd62e8232bfe2f48e70cead8b144837e5d6e" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="52595fed5ef1347de75a746cf3e2bbfe58e6c81a" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="b3e627842fcca80b977f59dd5e1d7d5f7a67939e" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="9addbdad0d291f4df823882d899c1939adba63d7" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="ffdb59fed6fa2e5eba8b785bee3dedddc521b934" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab