drop installer

debian/.gitignore

@@ -7,7 +7,6 @@
 !/bin/
 !/certs/
 !/config/
-!/installer/
 !/lib/
 !/patches*/
 !/rules.d/

debian/README.source

@@ -228,7 +228,6 @@ Build profiles
 Several build profiles are understood and supported:
 
 - nodoc: Exclude most documentation
-- noudeb: Exclude installer udeb packages
 - pkg.linux.notools: Exclude userland tool packages (linux-kbuild-<version>,
   linux-perf, etc.)
 - pkg.linux.mintools: Build minimal set of userland tool packages

debian/bin/gencontrol.py

@@ -33,11 +33,9 @@ locale.setlocale(locale.LC_CTYPE, "C.UTF-8")
 
 
 class Gencontrol(Base):
-    disable_installer: bool
     disable_signed: bool
 
     env_flags = [
-        ('DEBIAN_KERNEL_DISABLE_INSTALLER', 'disable_installer', 'installer modules'),
         ('DEBIAN_KERNEL_DISABLE_SIGNED', 'disable_signed', 'signed code'),
     ]
 
@@ -476,81 +474,6 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
                                       ["$(MAKE) -f debian/rules.real %s %s" %
                                        (merged_config, makeflags)])
 
-        if (
-            config.name_featureset == 'none'
-            and not self.disable_installer
-            and config.packages.installer
-        ):
-            with tempfile.TemporaryDirectory(prefix='linux-gencontrol') as config_dir:
-                base_path = pathlib.Path('debian/installer').absolute()
-                config_path = pathlib.Path(config_dir)
-                (config_path / 'modules').symlink_to(base_path / 'modules')
-                (config_path / 'package-list').symlink_to(base_path / 'package-list')
-
-                with (config_path / 'kernel-versions').open('w') as versions:
-                    versions.write(f'{arch} - {vars["flavour"]} - - -\n')
-
-                # Add udebs using kernel-wedge
-                kw_env = os.environ.copy()
-                kw_env['KW_DEFCONFIG_DIR'] = config_dir
-                kw_env['KW_CONFIG_DIR'] = config_dir
-                kw_proc = subprocess.Popen(
-                    ['kernel-wedge', 'gen-control', vars['abiname']],
-                    stdout=subprocess.PIPE,
-                    text=True,
-                    env=kw_env)
-                assert kw_proc.stdout is not None
-                udeb_packages_base = list(read_deb822(BinaryPackage, kw_proc.stdout))
-                kw_proc.wait()
-                if kw_proc.returncode != 0:
-                    raise RuntimeError('kernel-wedge exited with code %d' %
-                                       kw_proc.returncode)
-
-            udeb_packages = [
-                dataclasses.replace(
-                    package_base,
-                    # kernel-wedge currently chokes on Build-Profiles so add it now
-                    build_profiles=PackageBuildprofile.parse(
-                        '<!noudeb !pkg.linux.nokernel !pkg.linux.quick>',
-                    ),
-                    meta_rules_target='installer',
-                )
-                for package_base in udeb_packages_base
-            ]
-
-            makeflags_local = makeflags.copy()
-            makeflags_local['IMAGE_PACKAGE_NAME'] = udeb_packages[0].name
-
-            bundle_signed.add_packages(
-                udeb_packages,
-                (config.name_debianarch, config.name_featureset, config.name_flavour),
-                makeflags_local, arch=arch,
-            )
-
-            if build_signed:
-                # XXX This is a hack to exclude the udebs from
-                # the package list while still being able to
-                # convince debhelper and kernel-wedge to go
-                # part way to building them.
-                udeb_packages = [
-                    dataclasses.replace(
-                        package_base,
-                        # kernel-wedge currently chokes on Build-Profiles so add it now
-                        build_profiles=PackageBuildprofile.parse(
-                            '<pkg.linux.udeb-unsigned-test-build !noudeb'
-                            ' !pkg.linux.nokernel !pkg.linux.quick>',
-                        ),
-                        meta_rules_target='installer-test',
-                    )
-                    for package_base in udeb_packages_base
-                ]
-
-                self.bundle.add_packages(
-                    udeb_packages,
-                    (config.name_debianarch, config.name_featureset, config.name_flavour),
-                    makeflags_local, arch=arch, check_packages=False,
-                )
-
     def process_changelog(self) -> None:
         version = self.version = self.changelog[0].version
 

debian/config/alpha/defines.toml

@@ -3,8 +3,6 @@ name = 'alpha-generic'
 [flavour.description]
 hardware = 'Alpha'
 hardware_long = 'DEC Alpha systems with extended kernel start address (Wildfire, Titan, Marvel)'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'alpha-smp'

debian/config/amd64/defines.toml

@@ -5,8 +5,6 @@ is_default = true
 [flavour.description]
 hardware = '64-bit PCs'
 hardware_long = 'PCs with AMD64, Intel 64 or VIA Nano processors'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'cloud-amd64'

debian/config/arm64/defines.toml

@@ -4,8 +4,6 @@ name = 'arm64'
 is_default = true
 [flavour.description]
 hardware = '64-bit ARMv8 machines'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'cloud-arm64'

debian/config/armhf/defines.toml

@@ -5,8 +5,6 @@ is_default = true
 [flavour.description]
 hardware = 'ARMv7 multiplatform compatible SoCs'
 hardware_long = 'ARMv7 multiplatform kernel. See https://wiki.debian.org/DebianKernel/ARMMP for details of supported platforms'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = "armmp-lpae"

debian/config/hppa/defines.toml

@@ -5,8 +5,6 @@ is_default = true
 [flavour.description]
 hardware = '32-bit PA-RISC'
 hardware_long = 'HP PA-RISC 32-bit systems with max 4 GB RAM'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'parisc64'
@@ -16,8 +14,6 @@ compiler_gnutype_compat = 'hppa-linux-gnu'
 [flavour.description]
 hardware = '64-bit PA-RISC'
 hardware_long = 'HP PA-RISC 64-bit systems with support for more than 4 GB RAM'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/loong64/defines.toml

@@ -4,8 +4,6 @@ name = 'loong64'
 is_default = true
 [flavour.description]
 hardware = '64-bit LoongArch platforms'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/m68k/defines.toml

@@ -4,8 +4,6 @@ name = 'm68k'
 is_default = true
 [flavour.description]
 hardware = 'Motorola MC68020+ family'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/mips/defines.toml

@@ -8,8 +8,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Malta'
 hardware_long = 'MIPS Malta boards'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'mips32r2eb'
@@ -21,8 +19,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Generic (mips32r2eb)'
 hardware_long = 'MIPS Generic platform (mips32r2eb)'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'octeon'
@@ -35,8 +31,6 @@ kernel_stem = 'vmlinux'
 [flavour.description]
 hardware = 'Octeon'
 hardware_long = 'Cavium Networks Octeon'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/mips64/defines.toml

@@ -8,8 +8,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Malta'
 hardware_long = 'MIPS Malta boards'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'mips64r2eb'
@@ -21,8 +19,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Generic (mips64r2eb)'
 hardware_long = 'MIPS Generic platform (mips64r2eb)'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'octeon'
@@ -35,8 +31,6 @@ kernel_stem = 'vmlinux'
 [flavour.description]
 hardware = 'Octeon'
 hardware_long = 'Cavium Networks Octeon'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/mips64el/defines.toml

@@ -8,8 +8,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Malta'
 hardware_long = 'MIPS Malta boards'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'mips64r2el'
@@ -21,8 +19,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Generic (mips64r2el)'
 hardware_long = 'MIPS Generic platform (mips64r2el)'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'mips64r6el'
@@ -34,8 +30,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Generic (mips64r6el)'
 hardware_long = 'MIPS Generic platform (mips64r6el)'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'loongson-3'
@@ -46,8 +40,6 @@ config = [
 [flavour.description]
 hardware = 'Loongson 3A/3B'
 hardware_long = 'Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)'
-[flavour.packages]
-installer = true
 [flavour.relations.image]
 recommends = ['pmon-update']
 
@@ -62,8 +54,6 @@ kernel_stem = 'vmlinux'
 [flavour.description]
 hardware = 'Octeon'
 hardware_long = 'Cavium Networks Octeon'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/mips64r6el/defines.toml

@@ -8,8 +8,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Generic (mips64r6el)'
 hardware_long = 'MIPS Generic platform (mips64r6el)'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/mipsel/defines.toml

@@ -8,8 +8,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Malta'
 hardware_long = 'MIPS Malta boards'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'mips32r2el'
@@ -21,8 +19,6 @@ config = [
 [flavour.description]
 hardware = 'MIPS Generic (mips32r2el)'
 hardware_long = 'MIPS Generic platform (mips32r2el)'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'loongson-3'
@@ -33,8 +29,6 @@ config = [
 [flavour.description]
 hardware = 'Loongson 3A/3B'
 hardware_long = 'Loongson 3A or 3B based systems (e.g. from Loongson or Lemote)'
-[flavour.packages]
-installer = true
 [flavour.relations.image]
 recommends = ['pmon-update']
 
@@ -49,8 +43,6 @@ kernel_stem = 'vmlinux'
 [flavour.description]
 hardware = 'Octeon'
 hardware_long = 'Cavium Networks Octeon'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/powerpc/defines.toml

@@ -2,8 +2,6 @@
 name = 'powerpc'
 [flavour.description]
 hardware = 'uniprocessor 32-bit PowerPC'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'powerpc-smp'
@@ -23,8 +21,6 @@ config = [
 ]
 [flavour.description]
 hardware = '64-bit PowerPC'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/ppc64/defines.toml

@@ -9,8 +9,6 @@ config = [
 is_default = true
 [flavour.description]
 hardware = '64-bit PowerPC with 4k pages'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'powerpc64-64k'

debian/config/ppc64el/defines.toml

@@ -9,8 +9,6 @@ config = [
 is_default = true
 [flavour.description]
 hardware = 'Little-endian 64-bit PowerPC with 4k pages'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'powerpc64le-64k'

debian/config/riscv64/defines.toml

@@ -4,8 +4,6 @@ name = 'riscv64'
 is_default = true
 [flavour.description]
 hardware = '64-bit RISC-V platforms'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/s390x/defines.toml

@@ -4,8 +4,6 @@ name = 's390x'
 is_default = true
 [flavour.description]
 hardware = 'IBM zSeries'
-[flavour.packages]
-installer = true
 
 [[featureset]]
 name = 'none'

debian/config/sh4/defines.toml

@@ -3,16 +3,12 @@ name = 'sh7751r'
 [flavour.description]
 hardware = 'sh7751r'
 hardware_long = 'Renesas SH7751R R2D plus board'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'sh7785lcr'
 [flavour.description]
 hardware = 'sh7785lcr'
 hardware_long = 'Renesas SH7785 reference board'
-[flavour.packages]
-installer = true
 [flavour.relations.image]
 recommends = ['u-boot-tools']
 

debian/config/sparc64/defines.toml

@@ -6,8 +6,6 @@ config = [
 ]
 [flavour.description]
 hardware = 'uniprocessor 64-bit UltraSPARC'
-[flavour.packages]
-installer = true
 
 [[flavour]]
 name = 'sparc64-smp'

debian/installer/modules/affs-modules

@@ -1 +0,0 @@
-affs

debian/installer/modules/alpha-generic/ata-modules

@@ -1 +0,0 @@
-#include <ata-modules>

debian/installer/modules/alpha-generic/btrfs-modules

@@ -1 +0,0 @@
-#include <btrfs-modules>

debian/installer/modules/alpha-generic/cdrom-core-modules

@@ -1 +0,0 @@
-#include <cdrom-core-modules>

debian/installer/modules/alpha-generic/crypto-dm-modules

@@ -1 +0,0 @@
-#include <crypto-dm-modules>

debian/installer/modules/alpha-generic/crypto-modules

@@ -1 +0,0 @@
-#include <crypto-modules>

debian/installer/modules/alpha-generic/drm-core-modules

@@ -1 +0,0 @@
-#include <drm-core-modules>

debian/installer/modules/alpha-generic/ext4-modules

@@ -1 +0,0 @@
-#include <ext4-modules>

debian/installer/modules/alpha-generic/f2fs-modules

@@ -1 +0,0 @@
-#include <f2fs-modules>

debian/installer/modules/alpha-generic/fat-modules

@@ -1 +0,0 @@
-#include <fat-modules>

debian/installer/modules/alpha-generic/fb-modules

@@ -1 +0,0 @@
-#include <fb-modules>

debian/installer/modules/alpha-generic/input-modules

@@ -1 +0,0 @@
-#include <input-modules>

debian/installer/modules/alpha-generic/isofs-modules

@@ -1 +0,0 @@
-#include <isofs-modules>

debian/installer/modules/alpha-generic/jfs-modules

@@ -1 +0,0 @@
-#include <jfs-modules>

debian/installer/modules/alpha-generic/kernel-image

@@ -1,3 +0,0 @@
-#include <kernel-image>
-
-srm_env

debian/installer/modules/alpha-generic/loop-modules

@@ -1 +0,0 @@
-#include <loop-modules>

debian/installer/modules/alpha-generic/md-modules

@@ -1 +0,0 @@
-#include <md-modules>

debian/installer/modules/alpha-generic/multipath-modules

@@ -1 +0,0 @@
-#include <multipath-modules>

debian/installer/modules/alpha-generic/nbd-modules

@@ -1 +0,0 @@
-#include <nbd-modules>

debian/installer/modules/alpha-generic/nic-modules

@@ -1 +0,0 @@
-#include <nic-modules>

debian/installer/modules/alpha-generic/nic-pcmcia-modules

@@ -1 +0,0 @@
-#include <nic-pcmcia-modules>

debian/installer/modules/alpha-generic/nic-shared-modules

@@ -1 +0,0 @@
-#include <nic-shared-modules>

debian/installer/modules/alpha-generic/nic-usb-modules

@@ -1 +0,0 @@
-#include <nic-usb-modules>

debian/installer/modules/alpha-generic/nic-wireless-modules

@@ -1 +0,0 @@
-#include <nic-wireless-modules>

debian/installer/modules/alpha-generic/pata-modules

@@ -1 +0,0 @@
-#include <pata-modules>

debian/installer/modules/alpha-generic/pcmcia-modules

@@ -1 +0,0 @@
-#include <pcmcia-modules>

debian/installer/modules/alpha-generic/ppp-modules

@@ -1 +0,0 @@
-#include <ppp-modules>

debian/installer/modules/alpha-generic/sata-modules

@@ -1 +0,0 @@
-#include <sata-modules>

debian/installer/modules/alpha-generic/scsi-core-modules

@@ -1 +0,0 @@
-#include <scsi-core-modules>

debian/installer/modules/alpha-generic/scsi-modules

@@ -1 +0,0 @@
-#include <scsi-modules>

debian/installer/modules/alpha-generic/scsi-nic-modules

@@ -1 +0,0 @@
-#include <scsi-nic-modules>

debian/installer/modules/alpha-generic/serial-modules

@@ -1 +0,0 @@
-#include <serial-modules>

debian/installer/modules/alpha-generic/squashfs-modules

@@ -1 +0,0 @@
-#include <squashfs-modules>

debian/installer/modules/alpha-generic/usb-modules

@@ -1 +0,0 @@
-#include <usb-modules>

debian/installer/modules/alpha-generic/usb-serial-modules

@@ -1 +0,0 @@
-#include <usb-serial-modules>

debian/installer/modules/alpha-generic/usb-storage-modules

@@ -1 +0,0 @@
-#include <usb-storage-modules>

debian/installer/modules/alpha-generic/xfs-modules

@@ -1 +0,0 @@
-#include <xfs-modules>

debian/installer/modules/amd64/ata-modules

@@ -1,2 +0,0 @@
-#include <ata-modules>
-

debian/installer/modules/amd64/btrfs-modules

@@ -1 +0,0 @@
-#include <btrfs-modules>

debian/installer/modules/amd64/cdrom-core-modules

@@ -1,2 +0,0 @@
-#include <cdrom-core-modules>
-

debian/installer/modules/amd64/crypto-dm-modules

@@ -1 +0,0 @@
-#include <crypto-dm-modules>

debian/installer/modules/amd64/crypto-modules

@@ -1 +0,0 @@
-#include <crypto-modules>

debian/installer/modules/amd64/drm-core-modules

@@ -1 +0,0 @@
-#include <drm-core-modules>

debian/installer/modules/amd64/ext4-modules

@@ -1 +0,0 @@
-#include <ext4-modules>

debian/installer/modules/amd64/f2fs-modules

@@ -1 +0,0 @@
-#include <f2fs-modules>

debian/installer/modules/amd64/fat-modules

@@ -1,2 +0,0 @@
-#include <fat-modules>
-

debian/installer/modules/amd64/fb-modules

@@ -1,4 +0,0 @@
-#include <fb-modules>
-
-vesafb ?
-vga16fb

debian/installer/modules/amd64/firewire-core-modules

@@ -1 +0,0 @@
-#include <firewire-core-modules>

debian/installer/modules/amd64/input-modules

@@ -1 +0,0 @@
-#include <input-modules>

debian/installer/modules/amd64/isofs-modules

@@ -1 +0,0 @@
-#include <isofs-modules>

debian/installer/modules/amd64/jfs-modules

@@ -1 +0,0 @@
-#include <jfs-modules>

debian/installer/modules/amd64/kernel-image

@@ -1,8 +0,0 @@
-#include <kernel-image>
-
-# ACPI drivers
-fan
-thermal
-
-# Optimised CRC32
-crc32_pclmul

debian/installer/modules/amd64/loop-modules

@@ -1,2 +0,0 @@
-#include <loop-modules>
-

debian/installer/modules/amd64/md-modules

@@ -1,2 +0,0 @@
-#include <md-modules>
-

debian/installer/modules/amd64/mmc-core-modules

@@ -1 +0,0 @@
-#include <mmc-core-modules>

debian/installer/modules/amd64/mmc-modules

@@ -1 +0,0 @@
-#include <mmc-modules>

debian/installer/modules/amd64/mtd-core-modules

@@ -1 +0,0 @@
-#include <mtd-core-modules>

debian/installer/modules/amd64/multipath-modules

@@ -1 +0,0 @@
-#include <multipath-modules>

debian/installer/modules/amd64/nbd-modules

@@ -1 +0,0 @@
-#include <nbd-modules>

debian/installer/modules/amd64/nic-modules

@@ -1 +0,0 @@
-#include <nic-modules>

debian/installer/modules/amd64/nic-pcmcia-modules

@@ -1 +0,0 @@
-#include <nic-pcmcia-modules>

debian/installer/modules/amd64/nic-shared-modules

@@ -1 +0,0 @@
-#include <nic-shared-modules>

debian/installer/modules/amd64/nic-usb-modules

@@ -1 +0,0 @@
-#include <nic-usb-modules>

debian/installer/modules/amd64/nic-wireless-modules

@@ -1 +0,0 @@
-#include <nic-wireless-modules>

debian/installer/modules/amd64/pata-modules

@@ -1,2 +0,0 @@
-#include <pata-modules>
-

debian/installer/modules/amd64/pcmcia-modules

@@ -1 +0,0 @@
-#include <pcmcia-modules>

debian/installer/modules/amd64/pcmcia-storage-modules

@@ -1 +0,0 @@
-#include <pcmcia-storage-modules>

debian/installer/modules/amd64/ppp-modules

@@ -1,2 +0,0 @@
-#include <ppp-modules>
-

debian/installer/modules/amd64/rfkill-modules

@@ -1 +0,0 @@
-#include <rfkill-modules>

debian/installer/modules/amd64/sata-modules

@@ -1 +0,0 @@
-#include <sata-modules>

debian/installer/modules/amd64/scsi-core-modules

@@ -1,4 +0,0 @@
-#include <scsi-core-modules>
-
-# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
-scsi_transport_fc

debian/installer/modules/amd64/scsi-modules

@@ -1,3 +0,0 @@
-#include <scsi-modules>
-# To support nvme
-vmd

debian/installer/modules/amd64/scsi-nic-modules

@@ -1 +0,0 @@
-#include <scsi-nic-modules>

debian/installer/modules/amd64/serial-modules

@@ -1 +0,0 @@
-#include <serial-modules>

debian/installer/modules/amd64/sound-modules

@@ -1 +0,0 @@
-#include <sound-modules>

debian/installer/modules/amd64/speakup-modules

@@ -1 +0,0 @@
-#include <speakup-modules>

debian/installer/modules/amd64/squashfs-modules

@@ -1 +0,0 @@
-#include <squashfs-modules>

debian/installer/modules/amd64/udf-modules

@@ -1 +0,0 @@
-#include <udf-modules>