From 93019ced84882c156238d04141dd1e1935d2a2a5 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Fri, 19 Apr 2024 16:38:34 +0000 Subject: [PATCH] Integrate gitlab-ci/fix_supported_hardware and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b build:hardware: Add Trizeps VIII Plus, fix MX93 and sort entries -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/add2bb178b57aacfdb730b14d1440253a687d2c3 Revert "CI: remove 'setup_ssh' as ssh access is disabled" The SSH setup is required for some private projects that pull in external repos via SSH. This reverts commit 4d5bca8fb8aaebf8794ffa88a6d0aef779c9eedf. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- SRCREV.conf | 48 ++++++++++++++++++++++++------------------------ default.xml | 10 +++++----- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 19ff9d08..dcc8d92b 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 19ff9d080b2b029cd7afe21cf4f530c8df2c4c71 +Subproject commit dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 256da8f3..e1bfeb28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 19ff9d080b2b029cd7afe21cf4f530c8df2c4c71 + ref: dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: 19ff9d080b2b029cd7afe21cf4f530c8df2c4c71 + GITLAB_CI_REVISION: dcc8d92b38fde9c4feb2268eefdf7b68b25bc25b generate-build-pipeline: variables: diff --git a/SRCREV.conf b/SRCREV.conf index 665be176..f2d15eaa 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,25 +1,25 @@ -SRCREV:pn-atmel-mxt = "6c0280a80437d64b1e88ee2634482b061f2b53ef" -SRCREV:pn-egalaxi2c = "2bcaf7716a6974341f5ec24943afa0898dcccc2a" -SRCREV:pn-emc-test-suite = "4a180e56c42fc3c1c2c685bc07571f35eadd02c0" -SRCREV:pn-gf-productiontests = "b71e673721ce297ee1eafc89195a99eb99c9bbe4" -SRCREV:pn-gfeeprom = "ddfe362b5bed6feb413d7dc57b7fb926d6a3524b" -SRCREV:pn-gfplatdetect = "b993f246fd10e277b61953cef7e2c49c146794d7" -SRCREV:pn-gfxml2dto = "1fc4be9cadc6c2f85f8dd046971e232cb7ed897e" -SRCREV:pn-ilitek = "40fcbf4fe173f967b8806906c684610b80a3200c" -SRCREV:pn-kernel-module-touchgpio = "9583b2ae6b16bfa89c7af3c1a44f38e4ee5686f1" -SRCREV:pn-libmdb = "c9f640e2420ee6d70ba08da0c726b35291494518" -SRCREV:pn-linux-imx = "57e8e7c64a63b17ae36613ee46349d1d73fa7054" +SRCREV:pn-atmel-mxt = "482c0025475f9162c2923f5de9bdf798488fc605" +SRCREV:pn-egalaxi2c = "bdb8fb89004dc249e604b713fbab92fd49e795fd" +SRCREV:pn-emc-test-suite = "7fa76911f446cd51be77b00ab16338ab65e40b99" +SRCREV:pn-gf-productiontests = "8713fbde887d57e8497f0ef5c7e5ae2fa391d64c" +SRCREV:pn-gfeeprom = "b5a87d513467c5572cf58212103cc1a4b2c680ea" +SRCREV:pn-gfplatdetect = "a5ca35c92365fddbba3cb03ac45dea305e08766e" +SRCREV:pn-gfxml2dto = "9bcb36d33b67bedf6ba545c42410d3e41aa97a47" +SRCREV:pn-ilitek = "b0a7bd6dec09ed8b3576864b2ae385b318cd4384" +SRCREV:pn-kernel-module-touchgpio = "77f5980d7b654100fcd6eafce55373f061743eea" +SRCREV:pn-libmdb = "dcb80d0f95e4bc0e853c9280ec4de35851de72bc" +SRCREV:pn-linux-imx = "11747878c915d9a7f13cf57cf2862fe111d40959" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-linux-seconorth = "7a6d5ddec8b6b78d61bcc745241fa3724923e2b9" -SRCREV:pn-linux-seco-mtk = "11c5e60833ac4acf16a47fbaf9fa0728a131f299" -SRCREV:pn-qt-multi-screen-compositor = "88bcca954bd4683fd1c7a64412ea9f836e5608d5" -SRCREV:pn-seco-sharedconf = "41d4725ab220fb4c8d999a2f011bd448aca0abf4" -SRCREV:pn-seco-show-demo = "8f2cda917ee4ce3ab22fd44cd87922a81cf646db" -SRCREV:pn-seco-yocto-testsuite = "f294cf6a7cb1d5e4d4b00013f25f3df8ee54bdc1" -SRCREV:pn-secure-element-examples = "131a0ef81100c12f691d5e4fc7160f660efe8a25" -SRCREV:pn-touchcal-conv = "0fe142d257dcd088815f1f487c8aad3b657a5424" -SRCREV:pn-u-boot-seco-imx = "80e0dfcbb0ddd532a9c4a3affca86aca41cbaf00" -SRCREV:pn-u-boot-seco-mtk = "ce5d31284774603c03416da4382b47a159fabe0e" -SRCREV:pn-xconfig = "b747b4a4e35f0efb74b6844b323c35290478f32b" -SRCREV:pn-yocto-install = "478dec4e93ba379bae143884406f9911c8e4691f" -SRCREV:pn-seco-stm32 = "5435ae24d5c68af13e6eebe328cc9a8df058bf47" +SRCREV:pn-linux-seconorth = "9048fe4570c3d597a64c2ccd7aa926cf6f795316" +SRCREV:pn-linux-seco-mtk = "e75c14a27969b52b511fe9c6283af173fa616c1f" +SRCREV:pn-qt-multi-screen-compositor = "7abcbcea6b84b5134d55f8bc7b217fa4f803bedd" +SRCREV:pn-seco-sharedconf = "26079dfd86fa3a480ea9f4c530ffc7efa250e3e0" +SRCREV:pn-seco-show-demo = "6c574a0120013dc9bfe2f133230f9b027d9c548d" +SRCREV:pn-seco-yocto-testsuite = "685b673d0c2ee602ba3dac428a404aef8ef9fbb0" +SRCREV:pn-secure-element-examples = "3fec1824a0d6f3c5cb44fd9d474c5de55c773ea5" +SRCREV:pn-touchcal-conv = "8fd7d01bd252e6dc97b88fae76d4dba00a09aaa0" +SRCREV:pn-u-boot-seco-imx = "8b34def57fdbb489cccc4eb75a2cdec8772b9b6d" +SRCREV:pn-u-boot-seco-mtk = "4d9972e6ce0c352a2e98c156a8324f9037ba10e4" +SRCREV:pn-xconfig = "fc1fa38ef41f0004701a0950c3d1be4219d1ebf5" +SRCREV:pn-yocto-install = "970722149d6ac03df2cc47d5920e2f7bd7ade7b2" +SRCREV:pn-seco-stm32 = "821f441482eea3f77ef7165bfdc3b9e51efb7031" diff --git a/default.xml b/default.xml index 66d07d9d..169c9075 100644 --- a/default.xml +++ b/default.xml @@ -28,11 +28,11 @@ <project name="meta-mediatek-bsp.git" revision="048e2981c96b0e93896d540c53b789f8c93c7e6e" remote="rity" path="sources/meta-mediatek-bsp" /> <project name="meta-rity.git" revision="bc2393cf3c26a3db6da719a5e05d517c6fe01e6c" 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="b78a67fdb236a667b8eba87afcfba823498557a6" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-mtk" revision="092901f323712dbf6d1850652a1792c8162ed74e" remote="seco-ne" path="sources/meta-seconorth-mtk" /> - <project name="layers/meta-seconorth-distro" revision="d9e97ceba0bb7f1e6eef839c4b2c1ec599d30112" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="2a0119b2a4cef6a1471c69b495ca1cdf60155949" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="dd68e88c1db7561c6fa245e2f01a605fe8fdb68a" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="10c6b84cb4aea59e8450845e32dcc3d65c47c74d" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-mtk" revision="950754a8dd2b2f3f2c6ed0e51c17bc39b0f61565" remote="seco-ne" path="sources/meta-seconorth-mtk" /> + <project name="layers/meta-seconorth-distro" revision="2c633a85bcb9f2aeec3b451208d934b433a2ddd3" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="fa79fcdaba1f7bfaaa32add8cb1158a0b3fec9a4" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="bbe02a03c24b9f4cb52992d1ac25620aedb7514d" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project> -- GitLab