Merge branch 'sort-modules-in-signed-template' into 'sid'

gencontrol_signed.py: Sort list of modules before adding to .json, fixing reproducibility

See merge request kernel-team/linux!140
This commit is contained in:
Ben Hutchings 2019-04-17 19:51:35 +00:00
commit 6749bba1a0
1 changed files with 9 additions and 4 deletions

View File

@ -291,16 +291,21 @@ linux-signed-@arch@ (@signedsourceversion@) @distribution@; urgency=@urgency@
self.image_packages:
package_dir = 'debian/%s' % image_package_name
package_files = []
package_modules = []
package_files.append({'sig_type': 'efi',
'file': 'boot/vmlinuz-%s' % image_suffix})
for root, dirs, files in os.walk('%s/lib/modules' % package_dir,
onerror=raise_func):
for name in files:
if name.endswith('.ko'):
package_files.append(
{'sig_type': 'linux-module',
'file': '%s/%s' %
(root[(len(package_dir) + 1):], name)})
package_modules.append(
'%s/%s' %
(root[(len(package_dir) + 1):], name))
package_modules.sort()
for module in package_modules:
package_files.append(
{'sig_type': 'linux-module',
'file': module })
package_certs = [get_cert_fingerprint(cert, 'sha256')
for cert in get_certs(cert_file_name)]
assert len(package_certs) >= 1