[linux-signed] 03/03: udeb: Add Built-Using field

[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 0324ee4c64a3a05ce54f491e09bfee06d43af994
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 31 10:43:23 2016 -0600

    udeb: Add Built-Using field
    
    kernel-wedge has its own templates and they can't include the same
    substitution variables as those in debian/templates.  I could change
    kernel-wedge to work out the Built-Using field, but that's not that
    easy and adds further backporting work.
    
    Instead, set Built-Using for all our binary packages on the
    dpkg-gencontrol command line.
---
 debian/bin/gencontrol.py          | 4 +++-
 debian/changelog                  | 6 ++++++
 debian/templates/control.image.in | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 70ecc3e..73e45d5 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -39,7 +39,9 @@ class Gencontrol(Base):
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['VERSION'] = self.version.linux_version
-        makeflags['GENCONTROL_ARGS'] = '-v%(binaryversion)s' % vars
+        makeflags['GENCONTROL_ARGS'] = (
+            '-v%(binaryversion)s -DBuilt-Using="linux (%(imagesourceversion)s)"'
+            % vars)
         makeflags['PACKAGE_VERSION'] = self.binary_version
 
     def do_main_packages(self, packages, vars, makeflags, extra):
diff --git a/debian/changelog b/debian/changelog
index 93c5776..a1f1027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-signed (3.1) UNRELEASED; urgency=medium
+
+  * udeb: Add Built-Using field
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 31 Oct 2016 10:42:53 -0600
+
 linux-signed (3) experimental; urgency=medium
 
   * Update to linux version 4.8~rc8-1~exp1
diff --git a/debian/templates/control.image.in b/debian/templates/control.image.in
index d6b847c..ebbf474 100644
--- a/debian/templates/control.image.in
+++ b/debian/templates/control.image.in
@@ -9,4 +9,3 @@ Description: ${unsigned:DescriptionShort} (signed)
  ${unsigned:DescriptionLong}
  .
  ${signed:Description}
-Built-Using: linux (= @imagesourceversion@)

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