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