Gentoo Archives: gentoo-catalyst

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-catalyst@l.g.o
Cc: "Andreas K. Hüttel" <dilfridge@g.o>
Subject: [gentoo-catalyst] [PATCH] Add option to generate BSD-style tagged hashes (can be verified by modern coreutils)
Date: Wed, 24 Feb 2021 21:34:01
Message-Id: 20210224213026.1031-1-dilfridge@gentoo.org
1 Signed-off-by: Andreas K. Hüttel <dilfridge@g.o>
2 ---
3 catalyst/base/genbase.py | 6 +++++-
4 catalyst/defaults.py | 2 ++
5 2 files changed, 7 insertions(+), 1 deletion(-)
6
7 diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
8 index c7dd87bc..52418877 100644
9 --- a/catalyst/base/genbase.py
10 +++ b/catalyst/base/genbase.py
11 @@ -24,7 +24,11 @@ class GenBase():
12 h.update(data)
13
14 filename = os.path.split(filepath)[1]
15 - return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
16 +
17 + if self.settings['digest_format'] == 'bsd':
18 + return f'# {name.upper()} HASH\n{name.upper()} ({filename}) = {h.hexdigest()}\n'
19 + else:
20 + return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
21
22 def gen_contents_file(self, path):
23 c = self.settings['contents_map']
24 diff --git a/catalyst/defaults.py b/catalyst/defaults.py
25 index ccb0a584..2cede562 100644
26 --- a/catalyst/defaults.py
27 +++ b/catalyst/defaults.py
28 @@ -11,6 +11,7 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS
29 valid_config_file_values = frozenset([
30 "compression_mode",
31 "digests",
32 + "digest_format",
33 "distcc_hosts",
34 "distdir",
35 "envscript",
36 @@ -35,6 +36,7 @@ confdefaults = {
37 "compressor_options": XATTRS_OPTIONS['linux'],
38 "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'],
39 "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
40 + "digest_format": 'linux',
41 "distdir": portage.settings['DISTDIR'],
42 "icecream": "/var/cache/icecream",
43 'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'],
44 --
45 2.30.1

Replies