summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2011-12-23 09:23:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:20 +0000
commit00cfb148253f4cbd4aa650900694670674fc689a (patch)
tree49f5ce8f84cda093ec669f5f1b687d30d60a8aab
parent7e66c3c4c2ef6f26dfa0b93d6c9935d8384af2a3 (diff)
downloadpoky-00cfb148253f4cbd4aa650900694670674fc689a.tar.gz
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>
-rw-r--r--meta/classes/buildhistory.bbclass5
1 files changed, 4 insertions, 1 deletions
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() {
325 325
326 # Add some configuration information 326 # Add some configuration information
327 echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id 327 echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id
328 echo "${@buildhistory_get_layers(d)}" >> ${BUILDHISTORY_DIR_IMAGE}/build-id 328
329 cat >> ${BUILDHISTORY_DIR_IMAGE}/build-id <<END
330${@buildhistory_get_layers(d)}
331END
329} 332}
330 333
331# By prepending we get in before the removal of packaging files 334# By prepending we get in before the removal of packaging files