[linux-signed] 03/03: Drop '-signed' suffix from linux-image packages and expect unsigned packages to have a '-unsigned' suffix
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Fri Jun 10 13:54:01 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 f18f63ebe59b6340d11612259c40eb8517f89116
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Wed Jun 8 23:45:24 2016 +0100
Drop '-signed' suffix from linux-image packages and expect unsigned packages to have a '-unsigned' suffix
Stop copying Conflicts and Provides from the unsigned packages, as those
are only used to help unsigned and signed packages replace each other.
---
debian/bin/gencontrol.py | 19 ++++++++++++-------
debian/bin/sign.py | 2 +-
debian/changelog | 2 ++
debian/rules.real | 13 +++----------
.../{control.image-signed.in => control.image.in} | 7 +++----
.../{image-signed.postinst.in => image.postinst.in} | 0
.../{image-signed.postrm.in => image.postrm.in} | 0
.../{image-signed.preinst.in => image.preinst.in} | 0
.../{image-signed.prerm.in => image.prerm.in} | 0
9 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 31be69c..82103ea 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -39,12 +39,17 @@ class Gencontrol(Base):
packages['source']['Build-Depends'].append(
'linux-support-%(abiname)s (= %(imageversion)s)' % vars)
- def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
+ def do_arch_setup(self, vars, makeflags, arch, extra):
+ super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
+
if self.version.linux_modifier is None:
abiname_part = '-%s' % self.config.merge('abi', arch)['abiname']
- makeflags['ABINAME'] = vars['abiname'] = \
- self.config['version', ]['abiname_base'] + abiname_part
+ else:
+ abiname_part = ''
+ makeflags['ABINAME'] = vars['abiname'] = \
+ self.config['version', ]['abiname_base'] + abiname_part
+ def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
if os.getenv('DEBIAN_KERNEL_DISABLE_INSTALLER'):
if self.changelog[0].distribution == 'UNRELEASED':
import warnings
@@ -101,10 +106,10 @@ class Gencontrol(Base):
makeflags['IMAGEVERSION'] = vars['imageversion']
packages['source']['Build-Depends'].append(
- 'linux-image-%(abiname)s%(localversion)s (= %(imageversion)s) [%(arch)s]' % vars)
+ 'linux-image-%(abiname)s%(localversion)s-unsigned (= %(imageversion)s) [%(arch)s]' % vars)
packages_signed = self.process_packages(
- self.templates["control.image-signed"], vars)
+ self.templates["control.image"], vars)
for package in packages_signed:
name = package['Package']
@@ -121,8 +126,8 @@ class Gencontrol(Base):
makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_binary_arch)
for name in ['postinst', 'postrm', 'preinst', 'prerm']:
- self._substitute_file('image-signed.%s' % name, vars,
- 'debian/linux-image-%s%s-signed.%s' %
+ self._substitute_file('image.%s' % name, vars,
+ 'debian/linux-image-%s%s.%s' %
(vars['abiname'], vars['localversion'], name))
if __name__ == '__main__':
diff --git a/debian/bin/sign.py b/debian/bin/sign.py
index 908b877..f0a698b 100755
--- a/debian/bin/sign.py
+++ b/debian/bin/sign.py
@@ -183,7 +183,7 @@ def sign(config_name, imageversion_str, modules_privkey_name, modules_cert_name,
(abiname,
'' if featureset == 'none' else '-' + featureset,
flavour)
- package_name = 'linux-image-' + kernelversion
+ package_name = 'linux-image-%s-unsigned' % kernelversion
package_dir = get_package(mirror_url, suite,
package_name, imageversion_str, arch)
diff --git a/debian/changelog b/debian/changelog
index 97ce707..d0c2153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ linux-signed (2) UNRELEASED; urgency=medium
* gencontrol.py: Define ABINAME makefile variable for per-architecture rules
* Build signed udebs using configuration from linux-support
+ * Drop '-signed' suffix from linux-image packages and expect unsigned
+ packages to have a '-unsigned' suffix
-- Ben Hutchings <ben at decadent.org.uk> Wed, 08 Jun 2016 23:35:38 +0100
diff --git a/debian/rules.real b/debian/rules.real
index a917f2e..0cb1f77 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -8,7 +8,7 @@ build-indep:
install-signed: DH_OPTIONS = -p$(PACKAGE_NAME)
install-signed: KERNEL_VERSION = $(ABINAME)$(LOCALVERSION)
-install-signed: IMAGE_PACKAGE_NAME = linux-image-$(KERNEL_VERSION)
+install-signed: IMAGE_PACKAGE_NAME = linux-image-$(KERNEL_VERSION)-unsigned
install-signed: PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-signed: SIGNATURE_DIR = debian/signatures/$(IMAGE_PACKAGE_NAME)
install-signed:
@@ -46,8 +46,8 @@ install-signed:
dh_compress -Xcopyright.linux
dh_fixperms
dh_installdeb
-# Copy package relations and description from unsigned package
- for field in Depends Provides Suggests Recommends Conflicts Breaks; do \
+# Copy most package relations and description from unsigned package
+ for field in Depends Suggests Recommends Breaks; do \
echo >> debian/$(PACKAGE_NAME).substvars "unsigned:$$field=$$(dpkg-query -f '$${'$$field'}' -W $(IMAGE_PACKAGE_NAME))"; \
done
echo >> debian/$(PACKAGE_NAME).substvars "unsigned:DescriptionShort=$$(dpkg-query -f '$${Description}' -W $(IMAGE_PACKAGE_NAME) | head -n 1)"
@@ -60,13 +60,6 @@ install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=/usr/share/linux-support-$(ABINAME
install-udeb_$(ARCH): export KW_CONFIG_DIR=/usr/share/linux-support-$(ABINAME)/installer/$(ARCH)
install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%)
install-udeb_$(ARCH):
-# kernel-wedge doesn't expect a -signed suffix; work around that until we
-# decide whether the signed or unsigned packages get the suffix
- while read flavour; do \
- rm -f debian/linux-image-$(ABINAME)-$$flavour; \
- ln -s linux-image-$(ABINAME)-$$flavour-signed \
- debian/linux-image-$(ABINAME)-$$flavour; \
- done < <(awk '!/^#/ { print $$3 }' $(KW_CONFIG_DIR)/kernel-versions)
dh_testdir
dh_prep
kernel-wedge install-files $(ABINAME)
diff --git a/debian/templates/control.image-signed.in b/debian/templates/control.image.in
similarity index 52%
rename from debian/templates/control.image-signed.in
rename to debian/templates/control.image.in
index a6d0bab..3582fa5 100644
--- a/debian/templates/control.image-signed.in
+++ b/debian/templates/control.image.in
@@ -1,11 +1,10 @@
-Package: linux-image- at abiname@@localversion at -signed
+Package: linux-image- at abiname@@localversion@
Depends: ${unsigned:Depends}
Recommends: ${unsigned:Recommends}
Suggests: ${unsigned:Suggests}
Breaks: ${unsigned:Breaks}
-Conflicts: linux-image- at abiname@@localversion@, ${unsigned:Conflicts}
-Replaces: linux-image- at abiname@@localversion@
-Provides: linux-image- at abiname@@localversion@, ${unsigned:Provides}
+Conflicts: linux-image- at abiname@@localversion at -unsigned
+Replaces: linux-image- at abiname@@localversion at -unsigned
Description: ${unsigned:DescriptionShort} (signed)
${unsigned:DescriptionLong}
.
diff --git a/debian/templates/image-signed.postinst.in b/debian/templates/image.postinst.in
similarity index 100%
rename from debian/templates/image-signed.postinst.in
rename to debian/templates/image.postinst.in
diff --git a/debian/templates/image-signed.postrm.in b/debian/templates/image.postrm.in
similarity index 100%
rename from debian/templates/image-signed.postrm.in
rename to debian/templates/image.postrm.in
diff --git a/debian/templates/image-signed.preinst.in b/debian/templates/image.preinst.in
similarity index 100%
rename from debian/templates/image-signed.preinst.in
rename to debian/templates/image.preinst.in
diff --git a/debian/templates/image-signed.prerm.in b/debian/templates/image.prerm.in
similarity index 100%
rename from debian/templates/image-signed.prerm.in
rename to debian/templates/image.prerm.in
--
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