Merge tag 'debian/4.19.28-1'

Release linux (4.19.28-1).

* Drop patches that are already included in 5.0.1
* Drop ABI bump

2 files changed, 16 insertions, 26 deletions

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 817d00739117..1c125cfe15e6 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -11,7 +11,8 @@ import re
 from debian_linux import config
 from debian_linux.debian import PackageDescription, PackageRelation, \
     PackageRelationEntry, PackageRelationGroup, VersionLinux
-from debian_linux.gencontrol import Gencontrol as Base, merge_packages
+from debian_linux.gencontrol import Gencontrol as Base, merge_packages, \
+    iter_featuresets
 from debian_linux.utils import Templates, read_control
 
 locale.setlocale(locale.LC_CTYPE, "C.UTF-8")
@@ -147,11 +148,7 @@ class Gencontrol(Base):
                                            .append(package)
 
     def do_main_makefile(self, makefile, makeflags, extra):
-        fs_enabled = [featureset
-                      for featureset in self.config['base', ]['featuresets']
-                      if (self.config.merge('base', None, featureset)
-                          .get('enabled', True))]
-        for featureset in fs_enabled:
+        for featureset in iter_featuresets(self.config):
             makeflags_featureset = makeflags.copy()
             makeflags_featureset['FEATURESET'] = featureset
             cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
@@ -162,7 +159,7 @@ class Gencontrol(Base):
             makefile.add('source', ['source_%s' % featureset])
 
         makeflags = makeflags.copy()
-        makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled)
+        makeflags['ALL_FEATURESETS'] = ' '.join(iter_featuresets(self.config))
         super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
 
     def do_main_packages(self, packages, vars, makeflags, extra):
@@ -366,6 +363,7 @@ class Gencontrol(Base):
     def do_flavour_packages(self, packages, makefile, arch, featureset,
                             flavour, vars, makeflags, extra):
         headers = self.templates["control.headers"]
+        assert len(headers) == 1
 
         config_entry_base = self.config.merge('base', arch, featureset,
                                               flavour)
@@ -448,20 +446,19 @@ class Gencontrol(Base):
                 desc.append_short(config_entry_description
                                   .get('part-short-' + part, ''))
 
-        packages_dummy = []
         packages_own = []
 
         build_signed = config_entry_build.get('signed-code')
 
         image = self.templates[build_signed and "control.image-unsigned"
                                or "control.image"]
+        assert len(image) == 1
 
         vars.setdefault('desc', None)
 
         image_main = self.process_real_image(image[0], image_fields, vars)
         packages_own.append(image_main)
         makeflags['IMAGE_PACKAGE_NAME'] = image_main['Package']
-        packages_own.extend(self.process_packages(image[1:], vars))
 
         package_headers = self.process_package(headers[0], vars)
         package_headers['Depends'].extend(relations_compiler_headers)
@@ -491,7 +488,7 @@ class Gencontrol(Base):
             packages_own.extend(self.process_packages(
                 self.templates['control.image-dbg'], vars))
 
-        merge_packages(packages, packages_own + packages_dummy, arch)
+        merge_packages(packages, packages_own, arch)
 
         tests_control = self.process_package(
             self.templates['tests-control.image'][0], vars)
@@ -567,11 +564,6 @@ class Gencontrol(Base):
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour "
                             "%s" %
                             makeflags]
-        if packages_dummy:
-            cmds_binary_arch.append(
-                "$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s"
-                % (' '.join("-p%s" % i['Package'] for i in packages_dummy),
-                   makeflags))
         cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" %
                       makeflags]
         cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch-flavour %s" %
@@ -583,6 +575,12 @@ class Gencontrol(Base):
         makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour),
                      cmds=cmds_setup)
 
+        merged_config = ('debian/build/config.%s_%s_%s' %
+                         (arch, featureset, flavour))
+        makefile.add(merged_config,
+                     cmds=["$(MAKE) -f debian/rules.real %s %s" %
+                           (merged_config, makeflags)])
+
         # Substitute kernel version etc. into maintainer scripts,
         # translations and lintian overrides
         self._substitute_file('headers.postinst', vars,
diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py
index 7745bad0a77d..8d9436fdebc3 100755
--- a/debian/bin/gencontrol_signed.py
+++ b/debian/bin/gencontrol_signed.py
@@ -189,15 +189,7 @@ class Gencontrol(Base):
 
         packages_signed = self.process_packages(
             self.templates['control.image'], vars)
-
-        for package in packages_signed:
-            name = package['Package']
-            if name in packages:
-                package = packages.get(name)
-                package['Architecture'].add(arch)
-            else:
-                package['Architecture'] = arch
-                packages.append(package)
+        merge_packages(packages, packages_signed, arch)
 
         cmds_binary_arch = []
         for i in packages_signed:
@@ -293,7 +285,7 @@ linux-signed-@arch@ (@signedsourceversion@) @distribution@; urgency=@urgency@
             hasher.update(ssl.PEM_cert_to_DER_cert(cert))
             return hasher.hexdigest()
 
-        all_files = {}
+        all_files = {'packages': {}}
 
         for image_suffix, image_package_name, cert_file_name in \
                 self.image_packages:
@@ -312,7 +304,7 @@ linux-signed-@arch@ (@signedsourceversion@) @distribution@; urgency=@urgency@
             package_certs = [get_cert_fingerprint(cert, 'sha256')
                              for cert in get_certs(cert_file_name)]
             assert len(package_certs) >= 1
-            all_files[image_package_name] = {
+            all_files['packages'][image_package_name] = {
                 'trusted_certs': package_certs,
                 'files': package_files
             }