summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/upgrade.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-08-29 20:40:38 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:52 +0100
commit4b4387455c62cf19fa3d215a11b5d0b1211d4570 (patch)
tree8c42428ddfb65fbd8b9ba7a7ef0632fff0e7bcdf /scripts/lib/devtool/upgrade.py
parente5f61f85c550646bc7e26a1fe6d9df080864ef48 (diff)
downloadpoky-4b4387455c62cf19fa3d215a11b5d0b1211d4570.tar.gz
lib/oe/patch: commit with a dummy user/email when PATCHTOOL=git
When using PATCHTOOL = "git", the user of the system is not really the committer - it's the build system itself. Thus, specify "dummy" values for username and email instead of using the user's configured values. Various parts of the devtool code that need to make commits have also been updated to use the same logic. This allows PATCHTOOL = "git" and devtool to be used on systems where git user.name / user.email has not been set (on versions of git where it doesn't default a value under this circumstance). If you want to return to the old behaviour where the externally configured user name / email are used, set the following in your local.conf: PATCH_GIT_USER_NAME = "" PATCH_GIT_USER_EMAIL = "" Fixes [YOCTO #8703]. (From OE-Core rev: 765a9017eaf77ea3204fb10afb8181629680bd82) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/upgrade.py')
-rw-r--r--scripts/lib/devtool/upgrade.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index fc2f919383..a5063f57a9 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -227,7 +227,9 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin
227 for f in stdout.splitlines(): 227 for f in stdout.splitlines():
228 __run('git add "%s"' % f) 228 __run('git add "%s"' % f)
229 229
230 __run('git commit -q -m "Commit of upstream changes at version %s" --allow-empty' % newpv) 230 useroptions = []
231 oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=rd)
232 __run('git %s commit -q -m "Commit of upstream changes at version %s" --allow-empty' % (' '.join(useroptions), newpv))
231 __run('git tag -f devtool-base-%s' % newpv) 233 __run('git tag -f devtool-base-%s' % newpv)
232 234
233 (stdout, _) = __run('git rev-parse HEAD') 235 (stdout, _) = __run('git rev-parse HEAD')