[linux] 01/05: bug script: Put binary package name and version in the info file so linux-signed can easily replace them
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Wed Jun 8 21:23:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch benh/udebsig
in repository linux.
commit 5cdbf6167d517e101b24168d58e79731af2d1fdb
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Tue Jun 7 19:36:21 2016 +0100
bug script: Put binary package name and version in the info file so linux-signed can easily replace them
---
debian/changelog | 7 +++++++
debian/rules.real | 2 +-
debian/templates/image.bug/script | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e8fea13..1459180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.6.1-2) UNRELEASED; urgency=medium
+
+ * bug script: Put binary package name and version in the info file so
+ linux-signed can easily replace them
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 07 Jun 2016 19:37:55 +0100
+
linux (4.6.1-1) unstable; urgency=medium
* New upstream stable update:
diff --git a/debian/rules.real b/debian/rules.real
index d472770..550cdb0 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -420,7 +420,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug:
dh_installdirs usr/share/bug/$(PACKAGE_NAME)
dh_install debian/templates/image.bug/* usr/share/bug/$(PACKAGE_NAME)
chmod 755 $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/script
- printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\n" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
+ printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\nPACKAGE_NAME='$(PACKAGE_NAME)'\nPACKAGE_VERSION='$(SOURCEVERSION)'" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
diff --git a/debian/templates/image.bug/script b/debian/templates/image.bug/script
index 3926d8f..8e0b5d5 100644
--- a/debian/templates/image.bug/script
+++ b/debian/templates/image.bug/script
@@ -19,8 +19,8 @@ if [ "$RELEASE" == "$(uname -r)" ]; then
running_ver="${running_ver%% *}"
if [ "$running_ver" != "$SOURCEVERSION" ]; then
cat <<EOF
-You have installed version $SOURCEVERSION of
-linux-image-$RELEASE, but version $running_ver is currently
+You have installed version $PACKAGE_VERSION of
+$PACKAGE_NAME, but version $running_ver is currently
running.
You should reboot to complete the upgrade. Until you do this, some
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list