Drop linux-headers-<ver>-all and linux-headers-<ver>-all-<arch> packages

These metapackages were originally introduced to support building
binary packages of out-of-tree modules.  They were used by these
source packages:

* linux-modules-{extra,contrib,nonfree}-2.6 build-depended on them,
  but were removed before the squeeze release.
* After that, nvidia-graphics-modules build-dependend on them, but
  was removed before the stretch release.
* linux-latest build-depended on them for some time, to prevent it
  building metapackages before their dependencies.  It has now been
  merged into this source package.

So it appears that they are now obsolete.

1 files changed, 1 insertions, 18 deletions

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 159032c710b6..d5ee79be11c8 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -49,7 +49,6 @@ class Gencontrol(Base):
         },
         'packages': {
             'docs': config.SchemaItemBoolean(),
-            'headers-all': config.SchemaItemBoolean(),
             'installer': config.SchemaItemBoolean(),
             'libc-dev': config.SchemaItemBoolean(),
             'meta': config.SchemaItemBoolean(),
@@ -268,25 +267,9 @@ class Gencontrol(Base):
         build_signed = self.config.merge('build', arch) \
                                   .get('signed-code', False)
 
-        # Some userland architectures require kernels from another
-        # (Debian) architecture, e.g. x32/amd64.
-        # And some derivatives don't need the headers-all packages
-        # for other reasons.
-        if self.config['base', arch].get('featuresets') and \
-           self.config.merge('packages').get('headers-all', True):
-            headers_arch = self.templates["control.headers.arch"]
-            packages_headers_arch = self.process_packages(headers_arch, vars)
-            packages_headers_arch[-1]['Depends'].extend(PackageRelation())
-            extra['headers_arch_depends'] = (
-                packages_headers_arch[-1]['Depends'])
-        else:
-            packages_headers_arch = []
-
         if self.config.merge('packages').get('libc-dev', True):
             libc_dev = self.templates["control.libc-dev"]
-            packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
-
-        merge_packages(packages, packages_headers_arch, arch)
+            merge_packages(packages, self.process_packages(libc_dev, {}), arch)
 
         if self.config['base', arch].get('featuresets') and \
            self.config.merge('packages').get('source', True):