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

Refactoring: remove DISTRO_INSTALL_SCRIPTS

This variable is not needed anywhere else, so we can use its value
directly.
parent 1846382a
No related branches found
No related tags found
1 merge request!654Refactor passing information about release artifacts to the CI package stage
......@@ -28,9 +28,8 @@ DISTRO_BOOT_FILES = " \
boot.cfg \
"
# The variables DISTRO_INSTALL_SCRIPTS, DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
# The variables DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
# are used by the CI to copy/or link the needed files into the release folder
DISTRO_INSTALL_SCRIPTS = "${MACHINE_INSTALL_SCRIPTS}"
# Add an entry for each FSTYPE
DISTRO_IMAGES = "${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in d.getVar('IMAGE_FSTYPES').split() ] )}"
......@@ -38,7 +37,7 @@ DISTRO_IMAGES = "${@' '.join([ d.getVar('IMAGE_LINK_NAME') + '.' + fs for fs in
# List build results that are later handled in the CI
DISTRO_RELEASE_ARTEFACTS = " \
${DISTRO_IMAGES} \
${DISTRO_INSTALL_SCRIPTS} \
${MACHINE_INSTALL_SCRIPTS} \
"
# On imx8m we currently don't have the complete config infrastructure
......@@ -50,7 +49,7 @@ DISTRO_RELEASE_ARTEFACTS:append:mx8 = " \
DISTRO_EXTRA_RDEPENDS += " \
${DISTRO_BOOT_FILES} \
${DISTRO_INSTALL_SCRIPTS} \
${MACHINE_INSTALL_SCRIPTS} \
bootselect \
"
......
......@@ -44,7 +44,7 @@ DISTRO_BOOT_FILES = " \
IMAGE_BOOT_FILES:append = " ${DISTRO_BOOT_FILES} "
# The variables DISTRO_INSTALL_SCRIPTS, DISTRO_IMAGES, DISTRO_RELEASE_ARTEFACTS
# 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"
......
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