rename/adjust kernel packages

debian/bin/gencontrol.py

@@ -336,19 +336,11 @@ class Gencontrol(Base):
             packages_meta = (
                 self.bundle.add('image.meta', ruleid, makeflags, vars, arch=arch)
             )
-            assert len(packages_meta) == 1
             packages_meta += (
                 self.bundle.add('headers.meta',
                                   ruleid, makeflags, vars, arch=arch)
             )
-            assert len(packages_meta) == 2
-
-            if (
-                config.defs_flavour.is_default
-                and not self.vars['source_suffix']
-            ):
-                packages_meta[0].provides.append('linux-image-generic')
-                packages_meta[1].provides.append('linux-headers-generic')
+            assert len(packages_meta) > 0
 
             packages_own.extend(packages_meta)
 

debian/templates/config.control.in

@@ -1,12 +1,10 @@
-Package: @source_basename@-config-@version@
+Package: krd-linux-config-@version@
 Meta-Rules-Target: config
 Architecture: linux-any
 Build-Profiles: <!pkg.linux.nosource>
 Multi-Arch: same
 Depends: ${misc:Depends}
-Recommends: @source_basename@-source-@version@
-Description: Debian kernel configurations for Linux @version@
+Recommends: krd-linux-source-@version@
+Description: Kernel configurations for KrD's Linux kernel @version@
  This package contains the configuration files used to build kernel
  files.
- .
- These can be used as a basis for configuring custom kernels.

debian/templates/headers.control.in

@@ -1,12 +1,12 @@
-Package: linux-headers-@abiname@@localversion@
+Package: krd-linux-headers-@abiname@@localversion@
 Meta-Rules-Target: headers
 Build-Profiles: <!pkg.linux.nokernel>
 Depends:
- linux-headers-@abiname@-common@localversion_headers@ (= ${source:Version}),
- linux-image-@abiname@@localversion@ (= ${binary:Version}),
- linux-kbuild-@abiname@,
+ krd-linux-headers-@abiname@-common@localversion_headers@ (= ${source:Version}),
+ krd-linux-image-@abiname@@localversion@ (= ${binary:Version}),
+ krd-linux-kbuild-@abiname@,
  ${misc:Depends}
-Description: Header files for Linux @abiname@@localversion@
+Description: Header files for KrD's Linux kernel @abiname@@localversion@
  This package provides the architecture-specific kernel header files
  for Linux kernel @abiname@@localversion@, generally
  used for building out-of-tree kernel modules. These files are going to be

debian/templates/headers.featureset.control.in

@@ -1,10 +1,10 @@
-Package: linux-headers-@abiname@-common@localversion@
+Package: krd-linux-headers-@abiname@-common@localversion@
 Meta-Rules-Target: headers-common
 Build-Profiles: <!pkg.linux.nokernel>
 Architecture: all
 Depends: ${misc:Depends}
 Multi-Arch: foreign
-Description: Common header files for Linux @abiname@@localversion@
+Description: Common header files for KrD's Linux kernel @abiname@@localversion@
  This package provides the common kernel header files for Linux kernel
  version @abiname@@featureset_desc@, generally used for building
  out-of-tree kernel modules. These files are going to be installed into

debian/templates/headers.meta.control.in

@@ -1,8 +1,8 @@
-Package: linux-headers@source_suffix@@localversion@
+Package: krd-linux-headers@localversion@
 Meta-Rules-Target: meta
-Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=linux-headers-@abiname@@localversion@
+Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=krd-linux-headers-@abiname@@localversion@
 Build-Profiles: <!pkg.linux.nokernel !pkg.linux.nometa>
-Depends: linux-headers-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
-Description: Header files for Linux @flavour@ configuration (meta-package)
+Depends: krd-linux-headers-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
+Description: Header files for KrD's Linux kernel @flavour@ configuration (meta-package)
  This package depends on the architecture-specific header files for the latest
  Linux kernel @flavour@ configuration.

debian/templates/headers.meta.maintscript.in

@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/@package@ linux-headers-@abiname@@localversion@ 5.7~rc5-1~exp1 @package@

debian/templates/image.control.in

@@ -1,9 +1,9 @@
-Package: linux-image-@abiname@@localversion@
+Package: krd-linux-image-@abiname@@localversion@
 Meta-Rules-Target: image
 Build-Profiles: <!pkg.linux.nokernel>
 Build-Depends:
  kmod,
 Depends: kmod, linux-base (>= 4.3~), ${misc:Depends}
 Suggests: firmware-linux-free, debian-kernel-handbook
-Description: Linux @upstreamversion@ for @class@
+Description: KrD's Linux kernel image @upstreamversion@ for @class@
  The Linux kernel @upstreamversion@ and modules for use on @longclass@.

debian/templates/image.meta.control.in

@@ -1,9 +1,15 @@
-Package: linux-image@source_suffix@@localversion@
+Package: krd-linux-@localversion@
+Meta-Rules-Target: meta
+Build-Profiles: <!pkg.linux.nokernel !pkg.linux.nometa>
+Depends: krd-linux-image@localversion@ (= ${binary:Version}), krd-linux-headers@localversion@ (= ${binary:Version}), ${misc:Depends}
+Description: KrD's Linux kernel image and headers for @class@ (meta-package)
+
+Package: krd-linux-image@localversion@
 Meta-Rules-Target: meta
 Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=linux-image-@abiname@@localversion@
 Build-Profiles: <!pkg.linux.nokernel !pkg.linux.nometa>
-Depends: linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
+Depends: krd-linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
 Provides: linux-latest-modules-@abiname@@localversion@, wireguard-modules (= 1.0.0), virtualbox-guest-modules [amd64]
-Description: Linux for @class@ (meta-package)
+Description: KrD's Linux kernel image for @class@ (meta-package)
  This package depends on the latest Linux kernel and modules for use on
  @longclass@.

debian/templates/image.meta.maintscript.in

@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/@package@ linux-image-@abiname@@localversion@ 5.7~rc5-1~exp1 @package@

debian/templates/main.control.in

@@ -1,11 +1,11 @@
-Package: @source_basename@-support-@abiname@
+Package: krd-linux-support-@abiname@
 Meta-Rules-Target: support
 Build-Profiles: <!pkg.linux.notools>
 Architecture: all
 Section: devel
 Depends: ${python3:Depends}, python3-dacite, python3-jinja2, ${misc:Depends}
 Multi-Arch: foreign
-Description: Support files for Linux @upstreamversion@
+Description: Support files for KrD's Linux kernel @upstreamversion@
  This package provides support files for the Linux kernel build,
  e.g. scripts to handle ABI information and for generation of
  build system meta data.

debian/templates/sourcebin.control.in

@@ -1,16 +1,12 @@
-Package: @source_basename@-source-@version@
+Package: krd-linux-source-@version@
 Meta-Rules-Target: source
 Build-Profiles: <!pkg.linux.nosource !pkg.linux.quick>
 Architecture: all
 Section: kernel
 Build-Depends: patchutils, xz-utils
 Depends: binutils, xz-utils, ${misc:Depends}
-Recommends: build-essential, bc, rsync, kmod, cpio, bison, flex, libelf-dev, libssl-dev, @source_basename@-config-@version@
+Recommends: build-essential, bc, rsync, kmod, cpio, bison, flex, libelf-dev, libssl-dev, krd-linux-config-@version@
 Suggests: libncurses-dev | ncurses-dev, qtbase5-dev, pkg-config
 Multi-Arch: foreign
-Description: Linux kernel source for version @version@ with Debian patches
+Description: KrD's Linux kernel source for version @version@ with patches
  This package provides source code for the Linux kernel version @version@.
- This source closely tracks official Linux kernel releases.  Debian's
- modifications to that source consist of security fixes, bug fixes, and
- features that have already been (or are believed to be) accepted by the
- upstream maintainers.

debian/templates/sourcebin.meta.maintscript.in

@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/@package@ @source_basename@-source-@version@ 5.7~rc5-1~exp1 @package@

debian/templates/tools-versioned.control.in

@@ -1,8 +1,8 @@
-Package: linux-kbuild-@abiname@
+Package: krd-linux-kbuild-@abiname@
 Meta-Rules-Target: kbuild
 Build-Profiles: <!pkg.linux.notools>
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential
 Multi-Arch: foreign
-Description: Kbuild infrastructure for Linux @abiname@
+Description: Kbuild infrastructure for KrD's Linux @abiname@
  This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.