Skip to content
Snippets Groups Projects
Commit a316e95e authored by Tim Jaacks's avatar Tim Jaacks
Browse files

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.
parent ba99e05b
No related branches found
No related tags found
1 merge request!654Refactor passing information about release artifacts to the CI package stage
......@@ -28,15 +28,11 @@ DISTRO_BOOT_FILES = " \
boot.cfg \
"
# The variables DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
# are used by the CI to copy/or link the needed files into the release folder
# Add an entry for each FSTYPE
DISTRO_IMAGES = "${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in d.getVar('IMAGE_FSTYPES').split() ] )}"
# List build results that are later handled in the CI
# DISTRO_RELEASE_ARTEFACTS is used by the CI to package the files for the release
DISTRO_RELEASE_ARTEFACTS = " \
${DISTRO_IMAGES} \
${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in d.getVar('IMAGE_FSTYPES').split() ] )} \
${IMAGE_LINK_NAME}.manifest \
${IMAGE_LINK_NAME}.testdata.json \
${MACHINE_INSTALL_SCRIPTS} \
"
......
......@@ -44,16 +44,11 @@ DISTRO_BOOT_FILES = " \
IMAGE_BOOT_FILES:append = " ${DISTRO_BOOT_FILES} "
# The variables DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
# are used by the CI to copy/or link the needed files into the release folder
DISTRO_IMAGES:append = " ${IMAGE_LINK_NAME}.tgz"
DISTRO_IMAGES:append:mx8= " imx-boot.tar.gz imx-boot "
# List build results that are later handled in the CI
DISTRO_RELEASE_ARTEFACTS:append = "${IMAGE_LINK_NAME}.md5 "
# DISTRO_RELEASE_ARTEFACTS is used by the CI to package the files for the release
DISTRO_RELEASE_ARTEFACTS:append = " ${IMAGE_LINK_NAME}.tgz ${IMAGE_LINK_NAME}.md5"
DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
imx-boot.tar.gz \
imx-boot \
${KERNEL_IMAGETYPE}-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT} \
${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.bat' for dtb in d.getVar('KERNEL_DEVICETREE').split() if dtb.endswith('.dtb') ] )} \
${@' '.join([ "uuu-" + dtb.split('/')[-1].split('.')[0] + '.sh' for dtb in d.getVar('KERNEL_DEVICETREE').split() if dtb.endswith('.dtb') ] )} \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment