classes/buildhistory: show command line in commit message
Record the bitbake command line in the commit message as a further context indication. (From OE-Core rev: 34fb802b2170f0fe208e54e7a4d18f663db72f90) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
855b3252d9
commit
742266d660
|
@ -495,6 +495,14 @@ def buildhistory_get_sdkvars(d):
|
||||||
return outputvars(sdkvars, listvars, d)
|
return outputvars(sdkvars, listvars, d)
|
||||||
|
|
||||||
|
|
||||||
|
def buildhistory_get_cmdline(d):
|
||||||
|
if sys.argv[0].endswith('bin/bitbake'):
|
||||||
|
bincmd = 'bitbake'
|
||||||
|
else:
|
||||||
|
bincmd = sys.argv[0]
|
||||||
|
return '%s %s' % (bincmd, ' '.join(sys.argv[1:]))
|
||||||
|
|
||||||
|
|
||||||
buildhistory_commit() {
|
buildhistory_commit() {
|
||||||
if [ ! -d ${BUILDHISTORY_DIR} ] ; then
|
if [ ! -d ${BUILDHISTORY_DIR} ] ; then
|
||||||
# Code above that creates this dir never executed, so there can't be anything to commit
|
# Code above that creates this dir never executed, so there can't be anything to commit
|
||||||
|
@ -514,18 +522,19 @@ END
|
||||||
# Check if there are new/changed files to commit (other than metadata-revs)
|
# Check if there are new/changed files to commit (other than metadata-revs)
|
||||||
repostatus=`git status --porcelain | grep -v " metadata-revs$"`
|
repostatus=`git status --porcelain | grep -v " metadata-revs$"`
|
||||||
HOSTNAME=`hostname 2>/dev/null || echo unknown`
|
HOSTNAME=`hostname 2>/dev/null || echo unknown`
|
||||||
|
CMDLINE="${@buildhistory_get_cmdline(d)}"
|
||||||
if [ "$repostatus" != "" ] ; then
|
if [ "$repostatus" != "" ] ; then
|
||||||
git add -A .
|
git add -A .
|
||||||
# porcelain output looks like "?? packages/foo/bar"
|
# porcelain output looks like "?? packages/foo/bar"
|
||||||
# Ensure we commit metadata-revs with the first commit
|
# Ensure we commit metadata-revs with the first commit
|
||||||
for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do
|
for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do
|
||||||
git commit $entry metadata-revs -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
|
git commit $entry metadata-revs -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" -m "cmd: $CMDLINE" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
|
||||||
done
|
done
|
||||||
if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then
|
if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then
|
||||||
git push -q ${BUILDHISTORY_PUSH_REPO}
|
git push -q ${BUILDHISTORY_PUSH_REPO}
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
git commit ${BUILDHISTORY_DIR}/ --allow-empty -m "No changes: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
|
git commit ${BUILDHISTORY_DIR}/ --allow-empty -m "No changes: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" -m "cmd: $CMDLINE" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
|
||||||
fi) || true
|
fi) || true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue