[linux-signed] 01/02: debian/bin/sign.py: Read kconfig file into array of lines

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Thu Nov 3 20:17:37 UTC 2016


This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux-signed.

commit eb106061f536b83251de76623e587e28da88e83b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Nov 3 14:16:17 2016 -0600

    debian/bin/sign.py: Read kconfig file into array of lines
    
    We'll need to iterate over the config more than once, which doesn't
    work with file objects.
---
 debian/bin/sign.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/bin/sign.py b/debian/bin/sign.py
index 7895825..5a29108 100755
--- a/debian/bin/sign.py
+++ b/debian/bin/sign.py
@@ -210,14 +210,14 @@ def sign(config_name, imageversion_str, modules_privkey_name, modules_cert_name,
                 # EFI stub, which has space for an embedded signature.
                 with open(os.path.join(package_dir,
                                        'boot/config-%s' % kernelversion)) \
-                     as kconfig:
-                    if 'CONFIG_EFI_STUB=y\n' in kconfig:
-                        sign_image_efi('%s/boot/vmlinuz-%s' %
-                                       (package_dir, kernelversion),
-                                       '%s/boot/vmlinuz-%s.sig' %
-                                       (signature_dir, kernelversion),
-                                       image_privkey_name,
-                                       image_cert_name)
+                     as kconfig_file:
+                    kconfig = kconfig_file.readlines()
+                if 'CONFIG_EFI_STUB=y\n' in kconfig:
+                    sign_image_efi('%s/boot/vmlinuz-%s' %
+                                   (package_dir, kernelversion),
+                                   '%s/boot/vmlinuz-%s.sig' %
+                                   (signature_dir, kernelversion),
+                                   image_privkey_name, image_cert_name)
 
     print('Signatures should be committed: git add debian/signatures && git commit')
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-signed.git



More information about the Kernel-svn-changes mailing list