From patchwork Tue Jan 3 06:18:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 013/113] buildhistory: avoid quoting issues with the layer list for build-id Date: Tue, 03 Jan 2012 06:18:59 -0000 From: Saul Wold X-Patchwork-Id: 18027 Message-Id: To: openembedded-core@lists.openembedded.org From: Christopher Larson --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 files changed, 4 insertions(+), 1 deletions(-) diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 39f5ff6..6a08db4 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 <