summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoît Mauduit <bmauduit@beneth.fr>2023-01-12 14:23:57 +0100
committerSteve Sakoman <steve@sakoman.com>2023-01-19 13:00:34 -1000
commit3db6db22770515fe52d847bdafd6ec9809ab50e0 (patch)
treedac92da15a6b91a0b6048abb96bbc6fa41b4472c
parent6f44b146f0875c588252b5c3b2015a621eba86ab (diff)
downloadopenembedded-core-contrib-3db6db22770515fe52d847bdafd6ec9809ab50e0.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. Signed-off-by: Benoît Mauduit <bmauduit@beneth.fr> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 3bd6f78f79b3d3e87d8db1e11f58d8021f929843) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oe/reproducible.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py
index 2e815df190..768fd4f19c 100644
--- a/meta/lib/oe/reproducible.py
+++ b/meta/lib/oe/reproducible.py
@@ -113,7 +113,8 @@ def get_source_date_epoch_from_git(d, sourcedir):
return None
bb.debug(1, "git repository: %s" % gitpath)
- p = subprocess.run(['git', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], check=True, stdout=subprocess.PIPE)
+ p = subprocess.run(['git', '-c', 'log.showSignature=false', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'],
+ check=True, stdout=subprocess.PIPE)
return int(p.stdout.decode('utf-8'))
def get_source_date_epoch_from_youngest_file(d, sourcedir):