From f74c500a0d3979dea7393524e71ca7ec03bb5fde Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 23 Dec 2011 09:23:57 -0700 Subject: 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. Signed-off-by: Christopher Larson --- meta/classes/buildhistory.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 39f5ff6eac..6a08db467e 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -325,7 +325,10 @@ buildhistory_get_imageinfo() { # Add some configuration information 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 <