From 0cef1869ec1e2736562483c02485478e02430e6c Mon Sep 17 00:00:00 2001 From: gitbot <gitbot.north@seco.com> Date: Mon, 4 Mar 2024 09:53:26 +0000 Subject: [PATCH] Integrate gitlab-ci/add-genio510 and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/4595835d7633712a9b3239ef8a0b1cb793955582 build:machines: Add Genio510 to the build job template -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d8b5ab7b974f669395da0eab94bd7d30ec1dffaf scripts:firmware: Fix check for U-Boot file types On i.MX6 devices, the U-Boot file types are not set at all. Extent check for the existance of the uboot_file_types var. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 3146ed1..4595835 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 3146ed1eb9e122ed077e31b2307a64dbec3d7b03 +Subproject commit 4595835d7633712a9b3239ef8a0b1cb793955582 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 282c095..95a9b0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 3146ed1eb9e122ed077e31b2307a64dbec3d7b03 + ref: 4595835d7633712a9b3239ef8a0b1cb793955582 file: 'manifest-integration.yml' variables: - GITLAB_CI_REVISION: 3146ed1eb9e122ed077e31b2307a64dbec3d7b03 + GITLAB_CI_REVISION: 4595835d7633712a9b3239ef8a0b1cb793955582 BB_RECIPE_NAME: gfxml2dto -- GitLab