From 3fe33f5f6bb52c4301308bb1cd873d09a534c4e1 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Wed, 26 Jul 2023 12:12:27 +0000
Subject: [PATCH] Integrate gitlab-ci/unify-image-and-sdk-package-jobs and 3
more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5762a54c150e5848b2262dba53df1a335af42ae9
Yocto build: unify image and SDK package jobs
Image and SDK package jobs call the same package script just with
different arguments. Instead of having two job classes `package_release`
and `package_sdk` for these two tasks, merge them into the base class
`package` and make the differences configurable via a variable
`PACKAGE_TYPE`.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8e72eac2621d2791214220ff11f6bc3be47c2356
Yocto build: add variable for manual builds
Instead of hard-coding the rules for manual builds in each actual job,
conditionally add this to the `buildbase` class and add a variable
`MANUAL_BUILD` to the according jobs.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e6d719962b52339565e0ff1c3826192f170d9527
Yocto build: unify image and SDK build jobs
Image and SDK builds share a lot of similar code. Instead of having two
job classes `build_yocto_image` and `build_yocto_sdk` for these two
tasks, merge them into the base class `build_yocto` and make the
differences configurable via a variable.
The `dump_install_command` part of the script, which was not executed
for SDK builds, is always present now, but it's only executed if the
`INSTALLSCRIPT` variable is set, which is not the case for SDK builds.
The `collect_srcrevs` part of the script is executed in all cases. It
was not part of the SDK build before, but it's not less relevant there.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f892500f71f6fb29d9cd0442a2824b045b095ebe
Yocto build: make main artifacts path configurable
Instead of specifying all possible artifacts paths and abusing the fact
that GitLab ignores non-existing paths during artifact upload, implement
a cleaner solution with a configurable path.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 32 ++++++++++++++++----------------
default.xml | 8 ++++----
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index c227e053..5762a54c 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
+Subproject commit 5762a54c150e5848b2262dba53df1a335af42ae9
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d52b0cca..2dfd9863 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
+ ref: 5762a54c150e5848b2262dba53df1a335af42ae9
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: c227e0531a0b9c6a2b23f6ec27ad0afe4bdac8c2
+ GITLAB_CI_REVISION: 5762a54c150e5848b2262dba53df1a335af42ae9
generate-build-jobs:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 737f656e..08dbf0f1 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,20 +1,20 @@
SRCREV:pn-atmel-mxt = "9dc5f338bd0fd410772d53d8a22b8dee78572b66"
-SRCREV:pn-egalaxi2c = "238769c8d13ad2e8b7290000c3277b855f807e70"
-SRCREV:pn-emc-test-suite = "b2f9a4a5295d64328185895668a1ce24dd85d270"
-SRCREV:pn-gf-productiontests = "fc002b5034e73b11bb96dc748a72f7bd4aa5c78a"
-SRCREV:pn-gfeeprom = "a5e13aa155877d6398bdc28d09f6f0e25e012317"
-SRCREV:pn-gfplatdetect = "ac79d0b768a0018fe91c2ef5f0214504d5d77eae"
-SRCREV:pn-gfxml2dto = "ee96595639fcc940905440271c75507ebd35ce7a"
+SRCREV:pn-egalaxi2c = "4cbed4bcd97681ac3946494a614101787a50d247"
+SRCREV:pn-emc-test-suite = "bcc12539c350abe33089c7068dabe490399bd9bc"
+SRCREV:pn-gf-productiontests = "f753c27c1dd902c5c604f794a0279c85fcfbd839"
+SRCREV:pn-gfeeprom = "7f6a95ad923e09ad58373e6554ed2dfed3562de7"
+SRCREV:pn-gfplatdetect = "ca1d94949c5710df1cf004cbf7588eb3c091354b"
+SRCREV:pn-gfxml2dto = "878630190b6fd52a92dae38cf10ab5d318aea782"
SRCREV:pn-ilitek = "a74fba8cc783cfeeb771040a5fe669071183c139"
SRCREV:pn-kernel-module-touchgpio = "0823903ee1552e30477d7db942401af05ea5424a"
-SRCREV:pn-libmdb = "9eb194ec03cf2428bc1b2940dd3198842c5f577c"
-SRCREV:pn-linux-imx = "31bd78c2e364283d9e247f35c7857b69b725d982"
+SRCREV:pn-libmdb = "f5958c66437f240c4de5ec02fd312bb3c203a4cc"
+SRCREV:pn-linux-imx = "44f528d4f38cba869978de11b9e94a147e527f46"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "4f8f45cc78f4021eaf88201fc968de3897a2a2c6"
-SRCREV:pn-qt-multi-screen-compositor = "31575e1c1dcee97456efefc4953206347ce854ac"
-SRCREV:pn-seco-show-demo = "507b7cc2d72f8ac2223ebf8f0bef25167103601c"
-SRCREV:pn-seco-yocto-testsuite = "0ffe9d8a15c830f47d9331e84a4fb210c98655d3"
-SRCREV:pn-secure-element-examples = "3b5b0acc6f360e26598e0ee449373d75d40392a8"
-SRCREV:pn-touchcal-conv = "85716f2349b0c949c1981342bb836e17e1e18542"
-SRCREV:pn-u-boot-imx = "8e8655bf61bf5b393e6b9fcbe3269d4dfc83a99d"
-SRCREV:pn-xconfig = "0d0339334e7c8665a8288542087e0d8dfae949a2"
+SRCREV:pn-linux-seconorth = "bedc04170ccc1f4b1c89fe651411ca444f1a7506"
+SRCREV:pn-qt-multi-screen-compositor = "ec82cf0bc38605d7a474fa3af10e8d96c9ced561"
+SRCREV:pn-seco-show-demo = "c24c95cafbe97323bc41c0841f1bb4d35e44dcfe"
+SRCREV:pn-seco-yocto-testsuite = "6a57a578ea735e7e88ebe5f03234671e835b91a6"
+SRCREV:pn-secure-element-examples = "85bb5a072c42f9d6d1241ef11e01c21edb3d6fba"
+SRCREV:pn-touchcal-conv = "9f10be9ec903f801572566f7410b8cef762dcd59"
+SRCREV:pn-u-boot-imx = "c49cb6078888d102e6b59b095f285a4a5d8695aa"
+SRCREV:pn-xconfig = "acf3ec342205f69c1407c2fbd92864262ac908b3"
diff --git a/default.xml b/default.xml
index 8fd66757..d9dea534 100644
--- a/default.xml
+++ b/default.xml
@@ -21,10 +21,10 @@
<project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" />
- <project name="layers/meta-seconorth-machine" revision="c7a8e0acc07f779dde38cc6f5b4be1725c2082cf" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="1997f59ea8a394a4d41f1366347d8300edaf8cdf" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="7c98ca98161be9e078b55fad251b54be804486c9" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="4eff5eeba82e0a646708345091b7c3e0dd51a552" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="3dd50fddea28b2c716cd7848b7d3e7e4bf2db044" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="949497cfff55c2159ee55ddc77770cb393386b9f" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="d9177eebfa7a58f557af6870f189e3c516146790" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="f76ced364ee046065f670178def28af4dcaa0478" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab