diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-02-24 22:26:58 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2021-02-24 22:26:58 +0100 |
| commit | 483385348b32fab2230f596816b6e1d0b6489962 (patch) | |
| tree | 5dfd6a184ef151a8eeaf82f128f002470e869a60 /catalyst | |
| parent | targets: Use the correct distcc libdir (diff) | |
| download | catalyst-483385348b32fab2230f596816b6e1d0b6489962.tar.gz catalyst-483385348b32fab2230f596816b6e1d0b6489962.tar.bz2 catalyst-483385348b32fab2230f596816b6e1d0b6489962.zip | |
Add option to generate BSD-style tagged hashes (can be verified by modern coreutils)
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Diffstat (limited to 'catalyst')
| -rw-r--r-- | catalyst/base/genbase.py | 6 | ||||
| -rw-r--r-- | catalyst/defaults.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py index c7dd87bc..52418877 100644 --- a/catalyst/base/genbase.py +++ b/catalyst/base/genbase.py @@ -24,7 +24,11 @@ class GenBase(): h.update(data) filename = os.path.split(filepath)[1] - return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n' + + if self.settings['digest_format'] == 'bsd': + return f'# {name.upper()} HASH\n{name.upper()} ({filename}) = {h.hexdigest()}\n' + else: + return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n' def gen_contents_file(self, path): c = self.settings['contents_map'] diff --git a/catalyst/defaults.py b/catalyst/defaults.py index ccb0a584..2cede562 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -11,6 +11,7 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS valid_config_file_values = frozenset([ "compression_mode", "digests", + "digest_format", "distcc_hosts", "distdir", "envscript", @@ -35,6 +36,7 @@ confdefaults = { "compressor_options": XATTRS_OPTIONS['linux'], "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'], "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, + "digest_format": 'linux', "distdir": portage.settings['DISTDIR'], "icecream": "/var/cache/icecream", 'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'], |