diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2020-11-01 00:45:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-12 13:07:52 +0000 |
commit | 0fefc175076c039bdf8c77851d89256a2db4973d (patch) | |
tree | 5168acfbbb57d3a8e55633915aaf46d408ab1446 /meta/lib/oe | |
parent | f79d69a6a6e6cad20bf7d8d47bb6ec4b49700c20 (diff) | |
download | poky-0fefc175076c039bdf8c77851d89256a2db4973d.tar.gz |
lib/oe/patch: GitApplyTree: save 1 echo in commit-msg hook
* also remove the extra blank lines which is often added to patches
when refreshed with devtool (GitApplyTree.patch_line_prefix lines
are ignored when refreshing .patch files, but newly added blank
lines aren't - the leading blank line wasneeded for patches with
just the subject line (to prevent the GitApplyTree.patch_line_prefix
line ending appended to the commit summary), but we can add it
in prepareCommit instead
(From OE-Core rev: bbd467c393af5fa34a0b92d5461ff0bf427b3933)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/patch.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index fa92abe248..bb1c40aa1e 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -508,8 +508,7 @@ class GitApplyTree(PatchTree): | |||
508 | with open(commithook, 'w') as f: | 508 | with open(commithook, 'w') as f: |
509 | # NOTE: the formatting here is significant; if you change it you'll also need to | 509 | # NOTE: the formatting here is significant; if you change it you'll also need to |
510 | # change other places which read it back | 510 | # change other places which read it back |
511 | f.write('echo >> $1\n') | 511 | f.write('echo "\n%s: $PATCHFILE" >> $1' % GitApplyTree.patch_line_prefix) |
512 | f.write('echo "%s: $PATCHFILE" >> $1\n' % GitApplyTree.patch_line_prefix) | ||
513 | os.chmod(commithook, 0o755) | 512 | os.chmod(commithook, 0o755) |
514 | shutil.copy2(commithook, applyhook) | 513 | shutil.copy2(commithook, applyhook) |
515 | try: | 514 | try: |