summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-05-04 13:36:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:12 (GMT)
commitc003c045905ae068aae9b9a62662b20b1d14068a (patch)
tree2e77f83ec655810c26d2463b1c2f7897d3617db7 /meta/classes
parent35cc0b023f8b5f7b30b05da199fda7074fc6d9b7 (diff)
downloadpoky-c003c045905ae068aae9b9a62662b20b1d14068a.tar.gz
buildhistory: fix multiple commit of images and packages at the same time
The echo line here was merging multiple lines into one, and the result was that if both image and package changes had to be comitted then only the image changes were being committed and the package changes could potentially be merged into the next package change. Quoting the variable reference fixes this. Fixes [YOCTO #2411] (From OE-Core rev: 540cd9d42a4db562e5eca431cec89ac5a6a05cab) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/buildhistory.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 8d5b096..d2d19ff 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -402,7 +402,7 @@ buildhistory_commit() {
402 git add ${BUILDHISTORY_DIR}/* 402 git add ${BUILDHISTORY_DIR}/*
403 HOSTNAME=`hostname 2>/dev/null || echo unknown` 403 HOSTNAME=`hostname 2>/dev/null || echo unknown`
404 # porcelain output looks like "?? packages/foo/bar" 404 # porcelain output looks like "?? packages/foo/bar"
405 for entry in `echo $repostatus | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do 405 for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do
406 git commit ${BUILDHISTORY_DIR}/$entry -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null 406 git commit ${BUILDHISTORY_DIR}/$entry -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
407 done 407 done
408 if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then 408 if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then