diff options
author | Stephano Cetola <stephano.cetola@linux.intel.com> | 2016-10-03 16:32:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-07 16:43:57 +0100 |
commit | ef7828c9f2955dfde09a0c83694c8a67cdc34b40 (patch) | |
tree | 4c933927823ebc4be8ac7ff60ca44bb8b8f3fd57 /meta/classes/buildhistory.bbclass | |
parent | 4454d024485d671ded558e3c617900f6fad414a4 (diff) | |
download | poky-ef7828c9f2955dfde09a0c83694c8a67cdc34b40.tar.gz |
utils.bbclass: add function to check for git config user
If attempting to patch a git repo without a proper git config setup,
an error will occur saying user.name/user.email are needed by git
am/apply. After some code was removed from kernel-yocto, it was
simple enough to reproduce this error by creating a kernel patch and
using a container to build.
This patch abstracts out functionality that existed in buildhistory
for use in other classes. It also adds a call to this functionality
to the kernel-yocto class.
Fixes [YOCTO #10346]
introduced in OE-core revision
0f698dfd1c8bbc0d53ae7977e26685a7a3df52a3
(From OE-Core rev: 25b43cb05c645e43f96bc18906441b8fdc272228)
Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 6e5de0ef69..3a5bc2c3e3 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -57,6 +57,9 @@ SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory" | |||
57 | # class. | 57 | # class. |
58 | BUILDHISTORY_PRESERVE = "latest latest_srcrev" | 58 | BUILDHISTORY_PRESERVE = "latest latest_srcrev" |
59 | 59 | ||
60 | PATCH_GIT_USER_EMAIL ?= "buildhistory@oe" | ||
61 | PATCH_GIT_USER_NAME ?= "OpenEmbedded" | ||
62 | |||
60 | # | 63 | # |
61 | # Write out metadata about this package for comparison when writing future packages | 64 | # Write out metadata about this package for comparison when writing future packages |
62 | # | 65 | # |
@@ -708,15 +711,9 @@ END | |||
708 | git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true | 711 | git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true |
709 | git tag -f build-minus-1 > /dev/null 2>&1 || true | 712 | git tag -f build-minus-1 > /dev/null 2>&1 || true |
710 | fi | 713 | fi |
711 | # If the user hasn't set up their name/email, set some defaults | 714 | |
712 | # just for this repo (otherwise the commit will fail with older | 715 | check_git_config |
713 | # versions of git) | 716 | |
714 | if ! git config user.email > /dev/null ; then | ||
715 | git config --local user.email "buildhistory@${DISTRO}" | ||
716 | fi | ||
717 | if ! git config user.name > /dev/null ; then | ||
718 | git config --local user.name "buildhistory" | ||
719 | fi | ||
720 | # Check if there are new/changed files to commit (other than metadata-revs) | 717 | # Check if there are new/changed files to commit (other than metadata-revs) |
721 | repostatus=`git status --porcelain | grep -v " metadata-revs$"` | 718 | repostatus=`git status --porcelain | grep -v " metadata-revs$"` |
722 | HOSTNAME=`hostname 2>/dev/null || echo unknown` | 719 | HOSTNAME=`hostname 2>/dev/null || echo unknown` |