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(

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),
@@ -235,15 +246,16 @@ class Gencontrol(Base):
         self.write_files_json()
 
     def write_changelog(self):
-        # We need to insert a new version entry.
-        # Take the distribution and urgency from the linux changelog, and
-        # the base version from the changelog template.
+        # Copy the linux changelog, but:
+        # * Change the source package name and version
+        # * Insert a line to refer to refer to the linux source version
         vars = self.vars.copy()
         vars['source'] = self.changelog[0].source
         vars['distribution'] = self.changelog[0].distribution
         vars['urgency'] = self.changelog[0].urgency
-        vars['signedsourceversion'] = (re.sub(r'-', r'+',
-                                              vars['imagebinaryversion']))
+        vars['signedsourceversion'] = \
+            re.sub(r'\+b(\d+)$', r'.b\1',
+                   re.sub(r'-', r'+', vars['imagebinaryversion']))
 
         with codecs.open(self.template_debian_dir + '/changelog', 'w',
                          'utf-8') as f:

debian/changelog

-linux (5.5.4-1~exp1) UNRELEASED; urgency=medium
+linux (5.5.8-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release: https://kernelnewbies.org/Linux_5.5
   * New upstream stable update:
@@ -6,6 +6,10 @@ linux (5.5.4-1~exp1) UNRELEASED; urgency=medium
     https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.2
     https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.3
     https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.4
+    https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.5
+    https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.6
+    https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.7
+    https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.5.8
 
   [ Ben Hutchings ]
   * aufs: Update support patchset to aufs5.x-rcN 20200120; no functional
@@ -20,6 +24,17 @@ linux (5.5.4-1~exp1) UNRELEASED; urgency=medium
     - This patch allowed remotely disabling lockdown using usbip
     - Lockdown can be disabled by running "mokutil --disable-validation",
       rebooting, and confirming the change when prompted
+  * Set PYTHON=python3 for document build (fixes FTBFS)
+  * [x86,arm64] Move linux-headers metapackages to src:linux-signed-*.
+    This should ensure that src:linux and src:linux-signed-* transition to
+    testing together.
+  * debian/bin/gencontrol_signed.py: Generate valid versions in a linux binNMU
+  * udeb: Drop zlib-modules packages, as zlib_deflate is now always built-in
+    (fixes FTBFS on several architectures)
+  * [mips*/octeon] Fix and re-enable the Octeon Ethernet driver
+  * [mips*] Fix FTBFS:
+    - Increase RELOCATION_TABLE_SIZE to 0x160000
+    - Fix exception handler memcpy()
 
   [ Aurelien Jarno ]
   * [riscv64] Enable SECCOMP.
@@ -34,6 +49,9 @@ linux (5.5.4-1~exp1) UNRELEASED; urgency=medium
   * [arm64] Enable CONFIG_ARM64_ERRATUM_1418040
   * [arm64/cloud-arm64] Introduce cloud build flavour
 
+  [ Mark Pearson ]
+  * [amd64] CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT and CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT
+
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 20 Jan 2020 01:00:04 +0000
 
 linux (5.5~rc5-1~exp1) experimental; urgency=medium

debian/config/amd64/config

@@ -241,3 +241,8 @@ CONFIG_ZONE_DEVICE=y
 ##
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
+##
+## file: sound/soc/sof/intel/Kconfig
+##
+CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
+CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y

debian/config/kernelarch-mips/config

@@ -3,7 +3,7 @@
 ##
 CONFIG_CPU_HAS_MSA=y
 CONFIG_RELOCATABLE=y
-CONFIG_RELOCATION_TABLE_SIZE=0x00140000
+CONFIG_RELOCATION_TABLE_SIZE=0x00160000
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_KEXEC=y
 CONFIG_SECCOMP=y

debian/installer/modules/alpha-generic/zlib-modules

-#include <zlib-modules>

debian/installer/modules/armel-marvell/zlib-modules

-#include <zlib-modules>

debian/installer/modules/armhf-armmp/zlib-modules

-#include <zlib-modules>

debian/installer/modules/hppa-parisc64/zlib-modules

-#include "../hppa/zlib-modules"

debian/installer/modules/hppa/zlib-modules

-#include <zlib-modules>

debian/installer/modules/kernel-image

@@ -10,6 +10,9 @@ nls_base
 nls_utf8
 thermal_sys ?
 
+# In case it becomes modular again
+zlib_deflate
+
 # Basic paravirtual modules
 hv_utils ?
 hv_vmbus ?

debian/installer/modules/m68k/zlib-modules

-#include <zlib-modules>

debian/installer/modules/mips-4kc-malta/zlib-modules

-#include <zlib-modules>

debian/installer/modules/mips-octeon/zlib-modules

-#include <zlib-modules>

debian/installer/modules/mips/zlib-modules

-#include <zlib-modules>

debian/installer/modules/mipsel-loongson-3/zlib-modules

-#include <zlib-modules>

debian/installer/modules/powerpc/zlib-modules

-#include <zlib-modules>

debian/installer/modules/riscv64/zlib-modules

-#include <zlib-modules>

debian/installer/modules/s390x/zlib-modules

-#include <zlib-modules>

debian/installer/modules/sh4-sh7751r/zlib-modules

-#include <zlib-modules>