mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
buildhistory: avoid quoting issues with the layer list for build-id
--4ef4ab1d_66334873_12d0c Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline The layer list is multiline, and includes quotes, so including it within quotes is problematic, particularly if the revision includes characters which are not valid outside of a quoted string in shell. To reproduce this failure: do a build with an scm layer not on a branch. (From OE-Core rev: f74c500a0d3979dea7393524e71ca7ec03bb5fde) Signed-off-by: Christopher Larson <chris_larson@mentor.com (mailto:chris_larson@mentor.com)> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7e66c3c4c2
commit
00cfb14825
@@ -325,7 +325,10 @@ buildhistory_get_imageinfo() {
|
|||||||
|
|
||||||
# Add some configuration information
|
# Add some configuration information
|
||||||
echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id
|
echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id
|
||||||
echo "${@buildhistory_get_layers(d)}" >> ${BUILDHISTORY_DIR_IMAGE}/build-id
|
|
||||||
|
cat >> ${BUILDHISTORY_DIR_IMAGE}/build-id <<END
|
||||||
|
${@buildhistory_get_layers(d)}
|
||||||
|
END
|
||||||
}
|
}
|
||||||
|
|
||||||
# By prepending we get in before the removal of packaging files
|
# By prepending we get in before the removal of packaging files
|
||||||
|
|||||||
Reference in New Issue
Block a user