From 5a3210f46a0817d83b8599a78a4c7a12c91bfef0 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Tue, 7 Nov 2023 07:08:53 +0000
Subject: [PATCH] Integrate gitlab-ci/optional_fng_install and 2 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/9be2c52b180ef30dcfffa1b5d954f29bf4756c35
pipeline:build: Fix indentation of here-doc
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/245e65376f6ac736951bff23b1e0baec1b6aec94
pipeline:build: Make generation of install script optional
The Genio 700 platform doesn't have an fng_install.sh. Currently, the
pipeline fails because of the exit code in the script check.
Make the generation of the install command optional and only show a
warning if the script is missing.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8fedce8a6547a397d142f48f3e7be9e5b31a4237
pipeline:build: Add MediaTek Genio 700 SoC
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 42 +++++++++++++++++++++---------------------
default.xml | 10 +++++-----
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 6f773de5..9be2c52b 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 6f773de5a46c32b2ba590828513a50703d7e3d57
+Subproject commit 9be2c52b180ef30dcfffa1b5d954f29bf4756c35
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2d7bbb6..40d1b26c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 6f773de5a46c32b2ba590828513a50703d7e3d57
+ ref: 9be2c52b180ef30dcfffa1b5d954f29bf4756c35
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: 6f773de5a46c32b2ba590828513a50703d7e3d57
+ GITLAB_CI_REVISION: 9be2c52b180ef30dcfffa1b5d954f29bf4756c35
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 77f6d547..ff5e1369 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,24 +1,24 @@
-SRCREV:pn-atmel-mxt = "e78d89b9b4ade66b3b9b0556bf8624316f5dca5b"
-SRCREV:pn-egalaxi2c = "57f889f3781734543f82bbba936e8d532e1fe395"
-SRCREV:pn-emc-test-suite = "2e6c46daffa864783adf9bdba115f796ef9d899d"
-SRCREV:pn-gf-productiontests = "8ddeb5e44755a220233b6e1764f7b7319e0d08ea"
-SRCREV:pn-gfeeprom = "5074603d03e5831fdb61e5efbbd1f2ee0a4684e2"
-SRCREV:pn-gfplatdetect = "309e13c97e677ae62628243765100ce9162428db"
-SRCREV:pn-gfxml2dto = "55e72e4acbfd80b2091133581bcaa32e27060de0"
-SRCREV:pn-ilitek = "a4440f198da5283daf0db2a083f8839e6b33c845"
-SRCREV:pn-kernel-module-touchgpio = "8ed287e4b31b32b5617b9f4adfa4c7ea06f42598"
-SRCREV:pn-libmdb = "5480d874c2b1ba8bdb3a89d4382851f4a79d6dab"
-SRCREV:pn-linux-imx = "a33debe2706bf61f2cdc2732720533974472a5ae"
+SRCREV:pn-atmel-mxt = "0b33ae8649aecb03cb9c6733647e2a7d74b42faf"
+SRCREV:pn-egalaxi2c = "88e829786e064cbebb9d04e3269ca554139d82d3"
+SRCREV:pn-emc-test-suite = "4c0fb8fcb1383c2d805e75fb1eaa5e72c430423a"
+SRCREV:pn-gf-productiontests = "499a4416cd5e3fac7a176e4f0a1c2dcf0b2cac56"
+SRCREV:pn-gfeeprom = "0ceaa2c4e1614ea80cf2883f909b4e785e1893af"
+SRCREV:pn-gfplatdetect = "4e28fe58b3beb232d2f7d8e602ed0a8657156ce3"
+SRCREV:pn-gfxml2dto = "01a31176b40884ac170268e017f785e5523fd622"
+SRCREV:pn-ilitek = "06e24bad3ecc4a17b0bcdd091e481c60711dc1d0"
+SRCREV:pn-kernel-module-touchgpio = "730f695c5bd8a8b6d66d0373eff71cadd691543f"
+SRCREV:pn-libmdb = "bd36e0bdaeedb14f12c246cc1ea0c1d3bd8a4a5d"
+SRCREV:pn-linux-imx = "88511fe97379d46699201daf60ce4f992efb05e0"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "bb143749c161118b50917ff14ecad5ba782dfb02"
+SRCREV:pn-linux-seconorth = "8a3f6813e326a7ea33382804017af03174438de2"
SRCREV:pn-linux-seco-mtk = "fdf21f938423764f6b8af4e785cdb68083838806"
-SRCREV:pn-qt-multi-screen-compositor = "d4fac62b205529b6c089fcf2b69cb6ef670a7351"
-SRCREV:pn-seco-sharedconf = "a5551d9bd029dcd60632eb14d5268236608cfd4f"
-SRCREV:pn-seco-show-demo = "0c593383be8840fd1ec6420a44b3d9718253c207"
-SRCREV:pn-seco-yocto-testsuite = "61b2763ad6acf246948c4f7c44999a171c8cb68a"
-SRCREV:pn-secure-element-examples = "ca8e3e724634ddc593f02e1ef805d8c329d5e3fa"
-SRCREV:pn-touchcal-conv = "1e252f7ed5cbbd338d97d5cd0d4cc63e7f7653fe"
-SRCREV:pn-u-boot-seco-imx = "f3a4048e2898da92e39fe4272464b2759bf0a576"
+SRCREV:pn-qt-multi-screen-compositor = "36938c676f03da2e2c3a10d5297a96f9de8564e1"
+SRCREV:pn-seco-sharedconf = "b74689fb9e10792a5a8402f8e0ae6cf386b684ff"
+SRCREV:pn-seco-show-demo = "fc44b74e8204069987e6f9da43ca98661473330a"
+SRCREV:pn-seco-yocto-testsuite = "5c91a0bbb61c72db1f2456769536f863befe84a5"
+SRCREV:pn-secure-element-examples = "65f3b1ca311263c029c05c4990a8067e582491e2"
+SRCREV:pn-touchcal-conv = "149a64aa872401d542d234ab944257a2d47aec46"
+SRCREV:pn-u-boot-seco-imx = "5c68f3a86719c3305c8f619ded16d13f9d9e22da"
SRCREV:pn-u-boot-seco-mtk = "898c3a5ff8c7c884b3f44de2514a8372c1b3395e"
-SRCREV:pn-xconfig = "55af80b34a35b0b264b4b77ad2857c1be59070dd"
-SRCREV:pn-yocto-install = "8f29ad7ab467054b0cf44bbb3a947c0c832ed96f"
+SRCREV:pn-xconfig = "dce66629781861025c39b45a4590201fd3fbaeb3"
+SRCREV:pn-yocto-install = "9ef1148d8ecb102b76634986aac62311a8b68f8b"
diff --git a/default.xml b/default.xml
index 9345fbc7..e2dbd637 100644
--- a/default.xml
+++ b/default.xml
@@ -29,11 +29,11 @@
<project name="meta-mediatek-bsp.git" revision="cbdeb08971c7e705f909351340e29977cf30356e" remote="rity" path="sources/meta-mediatek-bsp" />
<project name="meta-rity.git" revision="2b3f3f14daa695469025086fe638da8ebe4a848e" remote="rity" path="sources/meta-rity" />
<project name="meta-rauc.git" revision="804386f04826ea7fe74a1b4e0a20991425c06d9c" remote="rauc" path="sources/meta-rauc" />
- <project name="layers/meta-seconorth-machine" revision="86bf033d4a228b9c1a3eb744134f787aee063661" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-mtk" revision="48f618529db611cab6f5eaad3937fc8a412e12d7" remote="seco-ne" path="sources/meta-seconorth-mtk" />
- <project name="layers/meta-seconorth-distro" revision="0cd7e9e0a32728a4de33eee65d8ebc75342a52f1" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="29e1daa342a7a61b3e8e0e9e84764d9b8be0d6d6" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="63d9fe5c5c94c94ace3efa34ae33f67606246e9f" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="c78b26ce16fb5ef93f06f095fce62598dea4542a" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-mtk" revision="9e075efcb4669155c3ee5efc82c4232e1cf262d0" remote="seco-ne" path="sources/meta-seconorth-mtk" />
+ <project name="layers/meta-seconorth-distro" revision="f812f1520a077e5cf560573ab11bc49c68d2e70a" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="e2b9052e1384958764de02b6ba1551dbe4b74e9e" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="8d9bca7feb1acf26d7a41c99e9000f0095aadd21" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab