[linux-signed] 01/01: Enable kernel image signing on armhf, as sbsigntool is now available

[debian-kernel at lists.debian.org]

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

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

commit fea71ebc3865f1c12475fe13dbe956dc9a1144c6
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Jul 1 15:39:44 2016 +0200

    Enable kernel image signing on armhf, as sbsigntool is now available
---
 debian/bin/sign.py                 | 4 ----
 debian/changelog                   | 3 ++-
 debian/templates/control.source.in | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/bin/sign.py b/debian/bin/sign.py
index c405fbf..8ddbf7a 100755
--- a/debian/bin/sign.py
+++ b/debian/bin/sign.py
@@ -190,10 +190,6 @@ def sign(config_name, imageversion_str, modules_privkey_name, modules_cert_name,
                              '%s/lib/modules/%s' % (signature_dir, kernelversion),
                              modules_privkey_name, modules_cert_name)
 
-                # XXX sbsigntool currently FTBFS on armhf
-                if arch == 'armhf':
-                    continue
-
                 # Currently we can only sign kernel images built with an
                 # EFI stub, which has space for an embedded signature.
                 with open(os.path.join(package_dir,
diff --git a/debian/changelog b/debian/changelog
index 3db41d4..44cc9d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ linux-signed (2.1) UNRELEASED; urgency=medium
 
   * Rename SUITE variable to MIRROR_SUITE and group it with MIRROR_URL
   * Use sign-file to detach and attach module signatures
-  * Enable kernel image signing on arm64, as sbsigntool is now available
+  * Enable kernel image signing on arm64 and armhf, as sbsigntool is now
+    available
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 26 Jun 2016 15:11:25 +0200
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 7b7517a..ccf0184 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Ben Hutchings <ben at decadent.org.uk>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9~), rsync, sbsigntool [amd64 arm64 i386], kernel-wedge (>= 2.94~), linux-kbuild- at version@
+Build-Depends: debhelper (>= 9~), rsync, sbsigntool [amd64 arm64 armhf i386], kernel-wedge (>= 2.94~), linux-kbuild- at version@
 Vcs-Git: https://anonscm.debian.org/git/kernel/linux-signed.git
 Vcs-Browser: https://anonscm.debian.org/cgit/kernel/linux-signed.git
 Homepage: https://www.kernel.org/

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