[linux-signed] 01/03: Use gencontrol.py to substitute kernel image package version in control file

[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 cc28ac327a90b4b4e8054dcaae71138a2a0b8780
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun May 29 18:19:30 2016 +0100

    Use gencontrol.py to substitute kernel image package version in control file
    
    We have to decide it when preparing the source package, so there's no
    point in delaying until binary build time.
---
 debian/rules.real                        | 1 -
 debian/templates/control.image-signed.in | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/rules.real b/debian/rules.real
index 6a99782..2d7494c 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -10,7 +10,6 @@ install-signed: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-signed: KERNEL_VERSION = $(ABINAME)$(LOCALVERSION)
 install-signed: IMAGE_PACKAGE_NAME = linux-image-$(KERNEL_VERSION)
 install-signed:
-	echo kernel:ImageVersion=$(KERNEL_IMAGE_VERSION) >> debian/$(PACKAGE_NAME).substvars
 	mkdir -p debian/$(PACKAGE_NAME)/lib/modules
 	cp -R debian/signatures/$(IMAGE_PACKAGE_NAME)/lib/modules/$(KERNEL_VERSION) \
 		debian/$(PACKAGE_NAME)/lib/modules/
diff --git a/debian/templates/control.image-signed.in b/debian/templates/control.image-signed.in
index 7fcde68..36dca92 100644
--- a/debian/templates/control.image-signed.in
+++ b/debian/templates/control.image-signed.in
@@ -1,5 +1,5 @@
 Package: linux-image- at abiname@@localversion at -signed
-Depends: linux-image- at abiname@@localversion@ (= ${kernel:ImageVersion}),
+Depends: linux-image- at abiname@@localversion@ (= @imageversion@),
  kmod (>= 22-1.2~), initramfs-tools (>= 0.125~), ${kernel:ImageSignTool},
  ${misc:Depends}
 Breaks: busybox (<< 1:1.22.0-19~), busybox-static

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