diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2020-02-18 18:59:41 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-02-19 20:51:33 +0000 |
| commit | d928b7fb5e04cbca6413eed14229e371e50ef9bd (patch) | |
| tree | 7bba77e1997aef9e539f9192a9d56d2c643930f2 /debian/bin | |
| parent | f77e5536299864651a77b930b8b2849604a8cf2a (diff) | |
| download | kernel_replicant_linux-d928b7fb5e04cbca6413eed14229e371e50ef9bd.tar.gz kernel_replicant_linux-d928b7fb5e04cbca6413eed14229e371e50ef9bd.tar.bz2 kernel_replicant_linux-d928b7fb5e04cbca6413eed14229e371e50ef9bd.zip | |
[x86,arm64] Move linux-headers metapackages to src:linux-signed-*
Since we got rid of src:linux-latest, there are no longer any
binary dependencies relating src:linux and src:linux-signed-*, and
they can transition to testing separately.
Building linux-headers metapackages from src:linux-signed-* introduces
a new binary dependency that should ensure that all these packages
transition to testing together.
Diffstat (limited to 'debian/bin')
| -rwxr-xr-x | debian/bin/gencontrol.py | 6 | ||||
| -rwxr-xr-x | debian/bin/gencontrol_signed.py | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 867085add60c..159032c710b6 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -507,7 +507,11 @@ class Gencontrol(Base): if extra.get('headers_arch_depends'): extra['headers_arch_depends'].append('%s (= ${binary:Version})' % packages_own[-1]['Package']) - if do_meta: + + # The header meta-packages will be built along with the signed + # packages, to create a dependency relationship that ensures + # src:linux and src:linux-signed-* transition to testing together. + if do_meta and not build_signed: packages_own.extend(self.process_packages( self.templates["control.headers.meta"], vars)) self.substitute_debhelper_config( diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py index d33f40b29ff7..2cec0286d8d9 100755 --- a/debian/bin/gencontrol_signed.py +++ b/debian/bin/gencontrol_signed.py @@ -203,19 +203,30 @@ class Gencontrol(Base): packages_meta = self.process_packages( self.templates['control.image.meta'], vars) assert len(packages_meta) == 1 + packages_meta += self.process_packages( + self.templates['control.headers.meta'], vars) + assert len(packages_meta) == 2 # Don't pretend to support build-profiles - del packages_meta[0]['Build-Profiles'] + for package in packages_meta: + del package['Build-Profiles'] packages_own.extend(packages_meta) - cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-meta " - "PACKAGE_NAME='%s' %s" % - (packages_meta[0]['Package'], makeflags)] + cmds_binary_arch += [ + "$(MAKE) -f debian/rules.real install-meta " + "PACKAGE_NAME='%s' LINK_DOC_PACKAGE_NAME='%s' %s" % + (package['Package'], package['Depends'][0][0].name, makeflags) + for package in packages_meta + ] self.substitute_debhelper_config( 'image.meta', vars, 'linux-image%(localversion)s' % vars, output_dir=self.template_debian_dir) + self.substitute_debhelper_config( + 'headers.meta', vars, + 'linux-headers%(localversion)s' % vars, + output_dir=self.template_debian_dir) merge_packages(packages, packages_own, arch) makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), |