From 4c8d17088f33cd23c631cb9b76c6ca9bfa5b44ea Mon Sep 17 00:00:00 2001 From: Benoît Mauduit Date: Thu, 12 Jan 2023 14:23:57 +0100 Subject: lib/oe/reproducible: Use git log without gpg signature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/lib/oe/reproducible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/lib/oe/reproducible.py') 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): 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): -- cgit v1.2.3-54-g00ecf