summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2011-12-23 09:23:57 -0700
committerSaul Wold <sgw@linux.intel.com>2012-01-02 20:26:22 -0800
commitf74c500a0d3979dea7393524e71ca7ec03bb5fde (patch)
tree52d9b1b10be3cd4b51b9cf73dd6ab4ec738460c6
parent09b1dc8bd886c8cd2a5d4085d8bb4b73ece1f5b0 (diff)
downloadopenembedded-core-f74c500a0d3979dea7393524e71ca7ec03bb5fde.tar.gz
openembedded-core-f74c500a0d3979dea7393524e71ca7ec03bb5fde.tar.bz2
openembedded-core-f74c500a0d3979dea7393524e71ca7ec03bb5fde.zip
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 <chris_larson@mentor.com (mailto:chris_larson@mentor.com)>
-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() {
# 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 <<END
+${@buildhistory_get_layers(d)}
+END
}
# By prepending we get in before the removal of packaging files