[linux-signed] 02/07: bug script: Replace package name and version after copying from unsigned package

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Wed Jun 8 17:16:22 UTC 2016


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

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

commit 0adfdd484981b107168676d39bbbd01962089ec5
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jun 7 20:08:49 2016 +0100

    bug script: Replace package name and version after copying from unsigned package
---
 debian/bin/gencontrol.py | 1 +
 debian/rules.real        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index cf2da6f..4f5dd1c 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -35,6 +35,7 @@ class Gencontrol(Base):
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
+        makeflags['PACKAGE_VERSION'] = self.package_version
 
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages['source']['Build-Depends'].append(
diff --git a/debian/rules.real b/debian/rules.real
index 2140d78..77b4d6b 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -29,9 +29,13 @@ install-signed:
 		cat $(SIGNATURE_DIR)/lib/modules/$(KERNEL_VERSION)/$$path \
 			>> $(PACKAGE_DIR)/$${path%.sig}; \
 	done < <(find $(SIGNATURE_DIR)/lib/modules/$(KERNEL_VERSION) -name '*.sig' -printf %P)
+# Copy bug scripts but change the info file to refer to the right package
 	mkdir -p $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)
 	rsync -a /usr/share/bug/$(IMAGE_PACKAGE_NAME)/ \
 		$(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/
+	sed -i -e 's/^PACKAGE_NAME=.*/PACKAGE_NAME=$(PACKAGE_NAME)/' \
+		-e 's/^PACKAGE_VERSION=.*/PACKAGE_VERSION=$(PACKAGE_VERSION)/' \
+		$(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
 	dh_install
 	dh_installchangelogs
 	cp /usr/share/doc/$(IMAGE_PACKAGE_NAME)/changelog.Debian.gz \

-- 
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