From ea06a8416b92a47fadb9a38cc1f697f00a6ce778 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 18 Oct 2022 14:04:56 +0000
Subject: [PATCH] Integrate gitlab-ci/add-release-suffix and 3 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/543a217064786c3ac2742c24c09f603de495541d
manifest_package: add release suffix
Customer specific manifest projects can now set the RELEASE_SUFFIX
variable, which then gets appended to the deployment folder names.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c763c43fc1eecf3d73af61573b9cbadb03db275e
alphaplan_fwr: change variable "release_name_local" to "release_name"
Otherwise it can be assumed that it might be correlated with
outputdir_local, which is not the case.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2d8d26a5b8c56340b2c7f86798405d5f3c2ba9a7
package_release: more refactoring
- Make output-dir an argument that can be passed multiple times instead
of hard-coding two dirs with certain meanings.
- Remove LOCALDIR variable from package.env, because it is not used
anywhere (only occurence was job class ".uploadsdkftp" which wasn't
used anywhere either).
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dc3698c8d0568853fc675ee74e68b6be802df71a
package_release: refactoring
Improve readability of package_release.py and its submodule
generate_release_metadata.py.
- Add describing comments throughout the file.
- Remove duplicate code from functions. Simplify them, so that they do
what their names say (and nothing more).
- Rename variables and function arguments to make their purpose clearer.
- Harmonize variable names with their corresponding command line arguments.
- Add pydoc for functions.
- Add type declarations to function arguments.
- Generate MD5 and metadata files in the source directories so that they
can be copied along with the rest of the files.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 28 ++++++++++++++--------------
default.xml | 8 ++++----
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index c831d1da..543a2170 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit c831d1da915a4ac386554ff5ba2f73a8ff0d3da3
+Subproject commit 543a217064786c3ac2742c24c09f603de495541d
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d62fd015..1127b503 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: c831d1da915a4ac386554ff5ba2f73a8ff0d3da3
+ ref: 543a217064786c3ac2742c24c09f603de495541d
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: c831d1da915a4ac386554ff5ba2f73a8ff0d3da3
+ GITLAB_CI_REVISION: 543a217064786c3ac2742c24c09f603de495541d
generate-build-jobs:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 23169189..e090fae0 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "d7b9235a3e71abd229518332af7fcf8049d875ff"
-SRCREV_pn-gfeeprom = "61933b46337737f63e0e1dab83ec4ac1c622cd7d"
-SRCREV_pn-guf-show-demo = "49cf52dfd5e0724ed5f289fb960ba21b655f6aff"
-SRCREV_pn-libmdb = "eb149ec4e82e0c22c50477a09d77241b85ff5a54"
-SRCREV_pn-ltp-guf-tests = "0c28115627f7926e0fc98bbf88f211d7d339af1c"
-SRCREV_pn-touchcal-conv = "6e769bf0cfe39430b5d4d61d8d1d914fae0c608d"
-SRCREV_pn-gfxml2dto = "aba69215e4e0c59f0abdf54edfe5d47484f269df"
-SRCREV_pn-egalaxi2c = "81aab4a1b9c70db522e98a8aff77970217b751cc"
-SRCREV_pn-gfplatdetect = "dbb623eb2a6628d8bac33226302635b97dc10dd2"
-SRCREV_pn-xconfig = "fefb3e6b47253ab588753eaf1db97f7e3c8f3d93"
-SRCREV_pn-linux-guf = "0fa8a7d750ea1253581a214d36f2075b187a520e"
-SRCREV_pn-linux-imx-kuk = "04e01d0d159e02702620b1e9921968eb68ac63f9"
-SRCREV_pn-u-boot-imx = "1330fad5469fc08e90d794b60f0248d41296c4e3"
-SRCREV_pn-qt-multi-screen-compositor = "a584cce151d61fb88674690c940cfba02e0f1e20"
+SRCREV_pn-gf-productiontests = "b422492de0d82b150ca608d01035ed288f37fd99"
+SRCREV_pn-gfeeprom = "bd33343f933e2691053c2f977c09d423c21a9738"
+SRCREV_pn-guf-show-demo = "7e7a67c6b9503f8fcac09d052d44d68a326c30c7"
+SRCREV_pn-libmdb = "86837cf1660d47244d994ae73134a1645f58c20b"
+SRCREV_pn-ltp-guf-tests = "fe81dc8de3d0f788d2d49d6d9f899bb63750dc23"
+SRCREV_pn-touchcal-conv = "9251c3398bf53623dc7b12a247602672522a2440"
+SRCREV_pn-gfxml2dto = "7297bad5fcdbfe03b1c4c6d92aa33020a8fa969d"
+SRCREV_pn-egalaxi2c = "b1762435f9dd6fb84ee2911e300dafe677f5ce90"
+SRCREV_pn-gfplatdetect = "95d6521af73afe0d6585d1f43ffca69a3078f5e5"
+SRCREV_pn-xconfig = "b1e0b0632a0843d294a726c5edd8661b4ac6efa2"
+SRCREV_pn-linux-guf = "9482625133f0b2de71768316029bc803d5f02c84"
+SRCREV_pn-linux-imx-kuk = "d91eaebac2e0de3c7355279f27536a7aebacf677"
+SRCREV_pn-u-boot-imx = "012752cdadae348f39026258dbd3cc5cbb3b0274"
+SRCREV_pn-qt-multi-screen-compositor = "c678cab3a323ca8e6192c1023b51a11c20625214"
diff --git a/default.xml b/default.xml
index 2e6dcee6..09c5e77c 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="564ecca6463a0253c5d6056f2688ba78c2d5eac5" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="b10ff5b8d1d81a18eaf946f8eb234887100c2096" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="b6a19fcd6d854a7f83ee323b636c5aa02b52b738" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="4c9ab9be7b54a183bf1471db6e4aacc767785f49" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="33afb8998c4d5115c1c91b5779276cc8b9bfa87a" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="2efdc52d65c914d65bb3529e4c94a1352af32031" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="b63d51c18e7a4d495ad76ab8b7740f84ccc20ddf" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="d7b8b1edf4336f80f4ee293cb1a2dca2f812e72e" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab