[linux-signed] 05/07: Change versions of binary packages to match the unsigned packages by default

[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 50b4a79acf69eb19569303688331f214db720c59
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jun 8 00:27:22 2016 +0100

    Change versions of binary packages to match the unsigned packages by default
    
    Add a variable in rules.defs to change this if it's ever necessary.
---
 debian/README.source     | 11 ++++++++---
 debian/bin/gencontrol.py |  8 +++-----
 debian/changelog         |  2 ++
 debian/rules             |  2 +-
 debian/rules.defs        |  1 +
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 79c0883..fb1df50 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -55,7 +55,12 @@ This is harmless in practice - sbsign will insert padding to fix it up.
 Then, to prepare the source package:
 
 4. Run 'debian/rules maintainerclean'
-5. Run 'debian/rules debian/control'
-6. Run 'dpkg-buildpackage -uc -us -S -d'
+5. Update debian/rules.defs:
+   - SIGNED_VERSION_SUFFIX: In case a new source upload is made
+     without changing KERNEL_IMAGE_VERSION, this suffix may be set
+     to e.g. +s2, +s3, etc. to distinguish the binary versions.
+     Normally it should be empty.
+6. Run 'debian/rules debian/control'
+7. Run 'dpkg-buildpackage -uc -us -S -d'
 
- -- Ben Hutchings <ben at decadent.org.uk>, Wed,  8 Jun 2016 13:01:43 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>, Wed,  8 Jun 2016 13:02:08 +0100
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 4f5dd1c..f0f2359 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -12,7 +12,7 @@ from debian_linux.utils import Templates
 import os.path, re, codecs
 
 class Gencontrol(Base):
-    def __init__(self, config, image_version):
+    def __init__(self, config, image_version, signed_version_suffix):
         super(Gencontrol, self).__init__(ConfigCoreDump(fp = open(config, "rb")), Templates(["debian/templates"]))
 
         config_entry = self.config['version',]
@@ -25,9 +25,7 @@ class Gencontrol(Base):
             'abiname': self.abiname,
             'imageversion': image_version,
         }
-
-        changelog_version = Changelog()[0].version
-        self.package_version = '%s+%s' % (image_version, changelog_version.complete)
+        self.package_version = image_version + signed_version_suffix
 
     def _substitute_file(self, template, vars, target, append=False):
         with codecs.open(target, 'a' if append else 'w', 'utf-8') as f:
@@ -85,4 +83,4 @@ class Gencontrol(Base):
                                   (vars['abiname'], vars['localversion'], name))
 
 if __name__ == '__main__':
-    Gencontrol(sys.argv[1] + "/config.defines.dump", sys.argv[2])()
+    Gencontrol(sys.argv[1] + "/config.defines.dump", sys.argv[2], sys.argv[3])()
diff --git a/debian/changelog b/debian/changelog
index 80dce01..a0d6e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ linux-signed (1~exp7) UNRELEASED; urgency=medium
   * debian/README.source: Document the SUITE variable
   * debian/README.source: Document additional steps to prepare the source
     package
+  * Change versions of binary packages to match the unsigned packages by
+    default
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 06 Jun 2016 01:58:08 +0100
 
diff --git a/debian/rules b/debian/rules
index 35882ee..7bc2f5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ else
 endif
 
 debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
-	$(GENCONTROL) /usr/src/linux-support-$(KERNEL_ABINAME) $(KERNEL_IMAGE_VERSION)
+	$(GENCONTROL) /usr/src/linux-support-$(KERNEL_ABINAME) $(KERNEL_IMAGE_VERSION) '$(SIGNED_VERSION_SUFFIX)'
 	md5sum $^ > debian/control.md5sum
 	@echo
 	@echo This target is made to fail intentionally, to make sure
diff --git a/debian/rules.defs b/debian/rules.defs
index db9075b..48f57d5 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -3,6 +3,7 @@ STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates
 KERNEL_ABINAME := 4.5.0-2
 KERNEL_IMAGE_VERSION := 4.5.5-1
+SIGNED_VERSION_SUFFIX :=
 SUITE = unstable
 
 MIRROR_URL = http://deb.debian.org/debian/

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