classes/buildhistory: ensure that git user email and name are set

The git user.email and user.name settings must be set or the commit to
the buildhistory repo (when BUILDHISTORY_COMMIT is set to "1") will
fail. If the user hasn't set these, set some dummy values since the
actual value is unlikely to be particularly useful and it's far worse
for the commit not to be done leaving the repository in a partially set
up state.

Prompted by [YOCTO #6973].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 211dcf18b54bf32ff4c15c713508af4735e88858..777aabc55da49502dbdd35692d28f04373888c44 100644 (file)
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -581,6 +581,15 @@ END
                        git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true
                        git tag -f build-minus-1 > /dev/null 2>&1 || true
                fi
+               # If the user hasn't set up their name/email, set some defaults
+               # just for this repo (otherwise the commit will fail with older
+               # versions of git)
+               if ! git config user.email > /dev/null ; then
+                       git config --local user.email "buildhistory@${DISTRO}"
+               fi
+               if ! git config user.name > /dev/null ; then
+                       git config --local user.name "buildhistory"
+               fi
                # Check if there are new/changed files to commit (other than metadata-revs)
                repostatus=`git status --porcelain | grep -v " metadata-revs$"`
                HOSTNAME=`hostname 2>/dev/null || echo unknown`