[linux-signed] 01/03: Rename SUITE variable to MIRROR_SUITE and group it with MIRROR_URL

[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 51440670a6f288074ce709602aacd338b989425d
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Jun 26 15:08:43 2016 +0200

    Rename SUITE variable to MIRROR_SUITE and group it with MIRROR_URL
---
 debian/README.source | 7 ++++---
 debian/changelog     | 6 ++++++
 debian/rules         | 2 +-
 debian/rules.defs    | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index fb1df50..9a9b873 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -28,8 +28,6 @@ To generate the signatures:
      linux-image package names, e.g. 4.5.0-trunk.
    - KERNEL_IMAGE_VERSION: Version of the linux-image packages to be
      signed.
-   - SUITE: Suite from which to download the linux-image packages, if
-     they are not already provided in debian/localpackages.
    - KERNEL_MODULES_PRIVKEY: Name of the private key file (RSA PEM
      format) for module signing.
    - KERNEL_MODULES_CERT: Name of the certificate file (X.509 PEM
@@ -40,6 +38,9 @@ To generate the signatures:
    - KERNEL_IMAGE_CERT: Name of the certificate file (X.509 PEM
      format) for image signing.  This certificate must be trusted by
      the boot loader for Secure Boot to work.
+   - MIRROR_SUITE: Suite from which to download the linux-image
+     packages, if they are not already provided in
+     debian/localpackages.
 2. If the packages are not yet publicly available (e.g. for a security
    update), create debian/localpackages/ and copy or link them into
    there.
@@ -63,4 +64,4 @@ Then, to prepare the source package:
 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:02:08 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>, Sun, 26 Jun 2016 15:07:55 +0200
diff --git a/debian/changelog b/debian/changelog
index a414a7c..94e4dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-signed (2.1) UNRELEASED; urgency=medium
+
+  * Rename SUITE variable to MIRROR_SUITE and group it with MIRROR_URL
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 26 Jun 2016 15:11:25 +0200
+
 linux-signed (2) experimental; urgency=medium
 
   * gencontrol.py: Define ABINAME makefile variable for per-architecture rules
diff --git a/debian/rules b/debian/rules
index d3fff2b..bd988dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,6 @@ maintainerclean:
 	rm -rf debian/control debian/control.md5sum debian/linux-* debian/rules.gen debian/localpackages debian/*-modules-*-di* debian/kernel-image-*-di*
 
 sign:
-	$(SIGN) /usr/src/linux-support-$(KERNEL_ABINAME) "$(KERNEL_IMAGE_VERSION)" "$(KERNEL_MODULES_PRIVKEY)" "$(KERNEL_MODULES_CERT)" "$(KERNEL_IMAGE_PRIVKEY)" "$(KERNEL_IMAGE_CERT)" "$(MIRROR_URL)" "$(SUITE)"
+	$(SIGN) /usr/src/linux-support-$(KERNEL_ABINAME) "$(KERNEL_IMAGE_VERSION)" "$(KERNEL_MODULES_PRIVKEY)" "$(KERNEL_MODULES_CERT)" "$(KERNEL_IMAGE_PRIVKEY)" "$(KERNEL_IMAGE_CERT)" "$(MIRROR_URL)" "$(MIRROR_SUITE)"
 
 .PHONY: build build-arch build-indep clean binary binary-arch binary-indep binary-arch-all maintainerclean sign
diff --git a/debian/rules.defs b/debian/rules.defs
index 4eb73ed..57e1a70 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -4,9 +4,9 @@ TEMPLATES_DIR = debian/templates
 KERNEL_ABINAME := 4.7.0-rc4
 KERNEL_IMAGE_VERSION := 4.7~rc4-1~exp1
 SIGNED_VERSION_SUFFIX :=
-SUITE = experimental
 
 MIRROR_URL = http://deb.debian.org/debian/
+MIRROR_SUITE = experimental
 
 # For initial testing - to be replaced with HSM
 KERNEL_SIGNER := benh at debian.org

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