From c8cb0d157b922ccfa74d77fb6d2cd277a97c53ce Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@seco.com> Date: Thu, 14 Sep 2023 12:06:45 +0000 Subject: [PATCH] Integrate meta-seconorth-distro/add-manifest-and-testdata-files-to-release-artifacts -- Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/a316e95e07325a22d3ee77111161ff5a42711b76 Refactoring: remove DISTRO_IMAGES variable DISTRO_IMAGES was passed to the CI package stage only to add the corresponding manifest and testdata.json files as well. Add these directly to DISTRO_RELEASE_ARTEFACTS and remove DISTRO_IMAGES variable. -- Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/ba99e05bc83f03f6fa9aa5cdfca37817f4426e70 Refactoring: remove DISTRO_INSTALL_SCRIPTS This variable is not needed anywhere else, so we can use its value directly. -- Commit: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/commit/1846382ad8120cf98a8ed25e5149bdc3f32d0c78 Refactoring: append to DISTRO_IMAGES for FNGSystem instead of redefining it ${IMAGE_LINK_NAME}.cpio.gz is part of DISTRO_IMAGES automatically due to its original definition in seconorth-distro.inc. Append ${IMAGE_LINK_NAME}.tgz to make clear that this is an addition compared to the Yocto build. --- default.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.xml b/default.xml index 9e85b19d..d349a65e 100644 --- a/default.xml +++ b/default.xml @@ -22,7 +22,7 @@ <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="4ff18c10335b8438e51ba688632cb1133d34ff96" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="26b9e2f4bc088afcf3ebf3e188c1d132bdf56676" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-distro" revision="a316e95e07325a22d3ee77111161ff5a42711b76" remote="seco-ne" path="sources/meta-seconorth-distro" /> <project name="layers/meta-seconorth-nogplv3" revision="7bcc7f5e5bdf03287d2a1bc2abb57417337c4d6e" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> <project name="config" revision="65a30c03db65e5fcb585c9aa53ac973e353a522d" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> -- GitLab