diff options
author | Benoît Mauduit <bmauduit@beneth.fr> | 2023-01-12 14:23:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-13 17:32:46 +0000 |
commit | 4c8d17088f33cd23c631cb9b76c6ca9bfa5b44ea (patch) | |
tree | 2b10465369671aba51c9c050f26892f23b9169da /meta/lib/oe | |
parent | 486791b3ac327b3acd5f0bfbf68d6b20d1d3b661 (diff) | |
download | poky-4c8d17088f33cd23c631cb9b76c6ca9bfa5b44ea.tar.gz |
lib/oe/reproducible: Use git log without gpg signature
Previously, if "showSignature" is present in user gitconfig, parsing
of the timestamp will fail.
Ideally we should replace this command with a git plumbing command.
(From OE-Core rev: 3bd6f78f79b3d3e87d8db1e11f58d8021f929843)
Signed-off-by: Benoît Mauduit <bmauduit@beneth.fr>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/reproducible.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py index 04a1810d4f..9ac75c02e3 100644 --- a/meta/lib/oe/reproducible.py +++ b/meta/lib/oe/reproducible.py | |||
@@ -115,7 +115,8 @@ def get_source_date_epoch_from_git(d, sourcedir): | |||
115 | return None | 115 | return None |
116 | 116 | ||
117 | bb.debug(1, "git repository: %s" % gitpath) | 117 | bb.debug(1, "git repository: %s" % gitpath) |
118 | p = subprocess.run(['git', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], check=True, stdout=subprocess.PIPE) | 118 | p = subprocess.run(['git', '-c', 'log.showSignature=false', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], |
119 | check=True, stdout=subprocess.PIPE) | ||
119 | return int(p.stdout.decode('utf-8')) | 120 | return int(p.stdout.decode('utf-8')) |
120 | 121 | ||
121 | def get_source_date_epoch_from_youngest_file(d, sourcedir): | 122 | def get_source_date_epoch_from_youngest_file(d, sourcedir): |