diff options
author | Benoît Mauduit <bmauduit@beneth.fr> | 2023-01-12 14:23:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-13 07:44:09 +0000 |
commit | 97f9525f2fba0b2021bec8ebee4d9520254c3fd5 (patch) | |
tree | 3da116d86de9ddd1c9cb8235467c8bc620c7deac /meta/lib | |
parent | c28f0905a267420a4444a5c28aab52862996cf45 (diff) | |
download | poky-97f9525f2fba0b2021bec8ebee4d9520254c3fd5.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: e872f6636f4cb51426edc6c985e58d2fb74e0f96)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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 0938e4cb39..1ed79b18ca 100644 --- a/meta/lib/oe/reproducible.py +++ b/meta/lib/oe/reproducible.py | |||
@@ -62,7 +62,8 @@ def get_source_date_epoch_from_git(d, sourcedir): | |||
62 | return None | 62 | return None |
63 | 63 | ||
64 | bb.debug(1, "git repository: %s" % gitpath) | 64 | bb.debug(1, "git repository: %s" % gitpath) |
65 | p = subprocess.run(['git', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], check=True, stdout=subprocess.PIPE) | 65 | p = subprocess.run(['git', '-c', 'log.showSignature=false', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], |
66 | check=True, stdout=subprocess.PIPE) | ||
66 | return int(p.stdout.decode('utf-8')) | 67 | return int(p.stdout.decode('utf-8')) |
67 | 68 | ||
68 | def get_source_date_epoch_from_youngest_file(d, sourcedir): | 69 | def get_source_date_epoch_from_youngest_file(d, sourcedir): |