debian/bin/gencontrol_signed.py: Put all files.json fields under "packages"

Follow the schema change made in
3a07a08a82
This commit is contained in:
Ben Hutchings 2019-03-10 22:46:07 +00:00
parent f9acfb6f08
commit 4454021eb3
2 changed files with 3 additions and 2 deletions

View File

@ -293,7 +293,7 @@ linux-signed-@arch@ (@signedsourceversion@) @distribution@; urgency=@urgency@
hasher.update(ssl.PEM_cert_to_DER_cert(cert))
return hasher.hexdigest()
all_files = {}
all_files = {'packages': {}}
for image_suffix, image_package_name, cert_file_name in \
self.image_packages:
@ -312,7 +312,7 @@ linux-signed-@arch@ (@signedsourceversion@) @distribution@; urgency=@urgency@
package_certs = [get_cert_fingerprint(cert, 'sha256')
for cert in get_certs(cert_file_name)]
assert len(package_certs) >= 1
all_files[image_package_name] = {
all_files['packages'][image_package_name] = {
'trusted_certs': package_certs,
'files': package_files
}

1
debian/changelog vendored
View File

@ -688,6 +688,7 @@ linux (4.19.28-1) UNRELEASED; urgency=medium
{fb,input,nic,scsi}-modules
* debian/bin/gencontrol.py: Add rules to build debian/build/config.*
* certs: Replace test signing certificate with production signing certificate
* debian/bin/gencontrol_signed.py: Put all files.json fields under "packages"
[ Wookey ]
* linux-perf: Enable coresight trace (libopencsd) support in perf