1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-04 14:10:01 +00:00

arm/images: ensured consistent firmware deployment

For builds using multiconfig, all of the firmware binaries listed were
being placed in the ${DEPLOYDIR} directly without preserving their
directory hierarchy. This meant that paths to firmware binaries relative
to the ${DEPLOYDIR} differed between builds depending on whether
multiconfig was enabled or not.

Signed-off-by: Frazer Carsley <frazer.carsley@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Frazer Carsley
2026-01-14 09:24:50 +00:00
committed by Jon Mason
parent f6c78d2770
commit 604c7e9a4e
@@ -18,11 +18,14 @@ do_deploy() {
firmware_loc=$(echo "${TMPDIR}" | sed "s/${TCLIBC}/musl/") firmware_loc=$(echo "${TMPDIR}" | sed "s/${TCLIBC}/musl/")
firmware_loc="${firmware_loc}_${MACHINE}/deploy/images/${MACHINE}" firmware_loc="${firmware_loc}_${MACHINE}/deploy/images/${MACHINE}"
for firmware in ${FIRMWARE_BINARIES}; do for firmware in ${FIRMWARE_BINARIES}; do
echo "cp -av ${firmware_loc}/${firmware} ${DEPLOYDIR}/" # Preserve the directory structure when copying
cp -av "${firmware_loc}/${firmware}" ${DEPLOYDIR}/ subdir="$(dirname -- "${firmware}")"
mkdir -p "${DEPLOYDIR}"/"${subdir}"
echo "cp -av ${firmware_loc}/${firmware} ${DEPLOYDIR}/${subdir}"
cp -av "${firmware_loc}/${firmware}" ${DEPLOYDIR}/"${subdir}"
if [ -L "${firmware_loc}/${firmware}" ]; then if [ -L "${firmware_loc}/${firmware}" ]; then
echo "cp -av ${firmware_loc}/$(readlink ${firmware_loc}/${firmware}) ${DEPLOYDIR}/" echo "cp -av ${firmware_loc}/$(readlink ${firmware_loc}/${firmware}) ${DEPLOYDIR}/${subdir}"
cp -av "${firmware_loc}/$(readlink ${firmware_loc}/${firmware})" ${DEPLOYDIR}/ cp -av "${firmware_loc}/$(readlink ${firmware_loc}/${firmware})" ${DEPLOYDIR}/${subdir}
fi fi
done done
} }