diff mbox series

[UNSTABLE,2/2] UBUNTU: [Packaging] Drop now unsupported d-i/ input files

Message ID 20211108133238.58361-2-dimitri.ledkov@canonical.com
State New
Headers show
Series [UNSTABLE,1/2] UBUNTU: [Packaging] Drop unused d-i build-deps and packaging | expand

Commit Message

Dimitri John Ledkov Nov. 8, 2021, 1:32 p.m. UTC
This patch bulk removes all the now unused /d-i/ udeb packaging input
files.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 debian.master/d-i/firmware/README.txt         |   4 -
 debian.master/d-i/firmware/amd64/README.txt   |   4 -
 debian.master/d-i/firmware/amd64/nic-modules  |   1 -
 debian.master/d-i/firmware/amd64/scsi-modules |   1 -
 debian.master/d-i/firmware/arm64/README.txt   |   4 -
 debian.master/d-i/firmware/arm64/nic-modules  |   1 -
 debian.master/d-i/firmware/arm64/scsi-modules |   1 -
 debian.master/d-i/firmware/armhf/README.txt   |   4 -
 debian.master/d-i/firmware/i386/README.txt    |   4 -
 debian.master/d-i/firmware/i386/nic-modules   |   1 -
 debian.master/d-i/firmware/i386/scsi-modules  |   1 -
 debian.master/d-i/firmware/nic-modules        |  14 --
 debian.master/d-i/firmware/powerpc/README.txt |   4 -
 .../d-i/firmware/powerpc/nic-modules          |   1 -
 .../d-i/firmware/powerpc/scsi-modules         |   1 -
 debian.master/d-i/firmware/ppc64el/README.txt |   4 -
 .../d-i/firmware/ppc64el/nic-modules          |   1 -
 .../d-i/firmware/ppc64el/scsi-modules         |   1 -
 debian.master/d-i/firmware/s390x/README.txt   |   4 -
 debian.master/d-i/firmware/s390x/nic-modules  |   1 -
 debian.master/d-i/firmware/s390x/scsi-modules |   1 -
 debian.master/d-i/firmware/scsi-modules       |   3 -
 debian.master/d-i/kernel-versions             |  17 --
 .../d-i/modules/amd64-virtual/block-modules   |   1 -
 .../d-i/modules/amd64-virtual/crypto-modules  |   1 -
 .../d-i/modules/amd64-virtual/fat-modules     |   1 -
 .../d-i/modules/amd64-virtual/fb-modules      |   1 -
 .../d-i/modules/amd64-virtual/floppy-modules  |   1 -
 .../d-i/modules/amd64-virtual/fs-core-modules |   1 -
 .../amd64-virtual/fs-secondary-modules        |   1 -
 .../d-i/modules/amd64-virtual/kernel-image    |   1 -
 .../d-i/modules/amd64-virtual/md-modules      |   1 -
 .../d-i/modules/amd64-virtual/message-modules |   1 -
 .../d-i/modules/amd64-virtual/mouse-modules   |   1 -
 .../modules/amd64-virtual/multipath-modules   |   1 -
 .../d-i/modules/amd64-virtual/nic-modules     |   1 -
 .../modules/amd64-virtual/nic-shared-modules  |   1 -
 .../d-i/modules/amd64-virtual/parport-modules |   1 -
 .../d-i/modules/amd64-virtual/scsi-modules    |   2 -
 .../d-i/modules/amd64-virtual/serial-modules  |   1 -
 .../amd64-virtual/storage-core-modules        |   1 -
 .../d-i/modules/amd64-virtual/virtio-modules  |   1 -
 .../d-i/modules/amd64-virtual/vlan-modules    |   1 -
 debian.master/d-i/modules/amd64/block-modules |   1 -
 .../d-i/modules/amd64/crypto-modules          |   1 -
 debian.master/d-i/modules/amd64/fat-modules   |   1 -
 debian.master/d-i/modules/amd64/fb-modules    |   1 -
 .../d-i/modules/amd64/firewire-core-modules   |   1 -
 .../d-i/modules/amd64/floppy-modules          |   1 -
 .../d-i/modules/amd64/fs-core-modules         |   1 -
 .../d-i/modules/amd64/fs-secondary-modules    |   1 -
 debian.master/d-i/modules/amd64/input-modules |   1 -
 debian.master/d-i/modules/amd64/ipmi-modules  |   1 -
 debian.master/d-i/modules/amd64/kernel-image  |   1 -
 debian.master/d-i/modules/amd64/md-modules    |   1 -
 .../d-i/modules/amd64/message-modules         |   1 -
 debian.master/d-i/modules/amd64/mouse-modules |   1 -
 .../d-i/modules/amd64/multipath-modules       |   1 -
 debian.master/d-i/modules/amd64/nfs-modules   |   1 -
 debian.master/d-i/modules/amd64/nic-modules   |   1 -
 .../d-i/modules/amd64/nic-pcmcia-modules      |   1 -
 .../d-i/modules/amd64/nic-shared-modules      |   1 -
 .../d-i/modules/amd64/nic-usb-modules         |   1 -
 .../d-i/modules/amd64/parport-modules         |   1 -
 debian.master/d-i/modules/amd64/pata-modules  |   1 -
 .../d-i/modules/amd64/pcmcia-modules          |   1 -
 .../d-i/modules/amd64/pcmcia-storage-modules  |   1 -
 debian.master/d-i/modules/amd64/plip-modules  |   1 -
 debian.master/d-i/modules/amd64/ppp-modules   |   1 -
 debian.master/d-i/modules/amd64/sata-modules  |   1 -
 debian.master/d-i/modules/amd64/scsi-modules  |   2 -
 .../d-i/modules/amd64/serial-modules          |   1 -
 .../d-i/modules/amd64/speakup-modules         |   1 -
 .../d-i/modules/amd64/storage-core-modules    |   1 -
 debian.master/d-i/modules/amd64/usb-modules   |   1 -
 .../d-i/modules/amd64/virtio-modules          |   1 -
 debian.master/d-i/modules/amd64/vlan-modules  |   1 -
 debian.master/d-i/modules/arm64/block-modules |   1 -
 .../d-i/modules/arm64/crypto-modules          |   1 -
 debian.master/d-i/modules/arm64/fat-modules   |   1 -
 .../d-i/modules/arm64/fs-core-modules         |   1 -
 .../d-i/modules/arm64/fs-secondary-modules    |   1 -
 debian.master/d-i/modules/arm64/input-modules |   1 -
 debian.master/d-i/modules/arm64/ipmi-modules  |   1 -
 debian.master/d-i/modules/arm64/kernel-image  |   1 -
 debian.master/d-i/modules/arm64/md-modules    |   1 -
 .../d-i/modules/arm64/message-modules         |   1 -
 debian.master/d-i/modules/arm64/mouse-modules |   1 -
 .../d-i/modules/arm64/multipath-modules       |   1 -
 debian.master/d-i/modules/arm64/nfs-modules   |   1 -
 debian.master/d-i/modules/arm64/nic-modules   |   1 -
 .../d-i/modules/arm64/nic-shared-modules      |   1 -
 .../d-i/modules/arm64/nic-usb-modules         |   1 -
 .../d-i/modules/arm64/parport-modules         |   1 -
 debian.master/d-i/modules/arm64/plip-modules  |   1 -
 debian.master/d-i/modules/arm64/ppp-modules   |   1 -
 debian.master/d-i/modules/arm64/sata-modules  |   1 -
 debian.master/d-i/modules/arm64/scsi-modules  |   2 -
 .../d-i/modules/arm64/speakup-modules         |   1 -
 .../d-i/modules/arm64/storage-core-modules    |   1 -
 debian.master/d-i/modules/arm64/usb-modules   |   1 -
 .../d-i/modules/arm64/virtio-modules          |   1 -
 debian.master/d-i/modules/arm64/vlan-modules  |   1 -
 debian.master/d-i/modules/armhf/block-modules |   1 -
 .../d-i/modules/armhf/crypto-modules          |   1 -
 debian.master/d-i/modules/armhf/fat-modules   |   1 -
 .../d-i/modules/armhf/fs-core-modules         |   1 -
 .../d-i/modules/armhf/fs-secondary-modules    |   1 -
 debian.master/d-i/modules/armhf/input-modules |   1 -
 debian.master/d-i/modules/armhf/ipmi-modules  |   1 -
 debian.master/d-i/modules/armhf/kernel-image  |   1 -
 debian.master/d-i/modules/armhf/md-modules    |   1 -
 debian.master/d-i/modules/armhf/mouse-modules |   1 -
 .../d-i/modules/armhf/multipath-modules       |   1 -
 debian.master/d-i/modules/armhf/nfs-modules   |   1 -
 debian.master/d-i/modules/armhf/nic-modules   |   1 -
 .../d-i/modules/armhf/nic-shared-modules      |   1 -
 .../d-i/modules/armhf/nic-usb-modules         |   1 -
 .../d-i/modules/armhf/parport-modules         |   1 -
 debian.master/d-i/modules/armhf/plip-modules  |   1 -
 debian.master/d-i/modules/armhf/ppp-modules   |   1 -
 debian.master/d-i/modules/armhf/sata-modules  |   1 -
 debian.master/d-i/modules/armhf/scsi-modules  |   2 -
 .../d-i/modules/armhf/speakup-modules         |   1 -
 .../d-i/modules/armhf/storage-core-modules    |   1 -
 debian.master/d-i/modules/armhf/usb-modules   |   1 -
 debian.master/d-i/modules/armhf/vlan-modules  |   1 -
 debian.master/d-i/modules/block-modules       |  43 ----
 .../d-i/modules/block-modules.powerpc         |  31 ---
 debian.master/d-i/modules/crypto-modules      |  78 -------
 .../d-i/modules/dasd-extra-modules.s390x      |   1 -
 debian.master/d-i/modules/dasd-modules.s390x  |   3 -
 debian.master/d-i/modules/fat-modules         |   7 -
 debian.master/d-i/modules/fb-modules          |   3 -
 .../d-i/modules/firewire-core-modules         |   4 -
 debian.master/d-i/modules/floppy-modules      |   1 -
 debian.master/d-i/modules/fs-core-modules     |   6 -
 .../d-i/modules/fs-secondary-modules          |   5 -
 .../d-i/modules/i386-virtual/block-modules    |   1 -
 .../d-i/modules/i386-virtual/crypto-modules   |   1 -
 .../d-i/modules/i386-virtual/fat-modules      |   1 -
 .../d-i/modules/i386-virtual/fb-modules       |   1 -
 .../d-i/modules/i386-virtual/floppy-modules   |   1 -
 .../d-i/modules/i386-virtual/fs-core-modules  |   1 -
 .../modules/i386-virtual/fs-secondary-modules |   1 -
 .../d-i/modules/i386-virtual/kernel-image     |   1 -
 .../d-i/modules/i386-virtual/md-modules       |   1 -
 .../d-i/modules/i386-virtual/message-modules  |   1 -
 .../d-i/modules/i386-virtual/mouse-modules    |   1 -
 .../modules/i386-virtual/multipath-modules    |   1 -
 .../d-i/modules/i386-virtual/nic-modules      |   1 -
 .../modules/i386-virtual/nic-shared-modules   |   1 -
 .../d-i/modules/i386-virtual/parport-modules  |   1 -
 .../d-i/modules/i386-virtual/scsi-modules     |   2 -
 .../d-i/modules/i386-virtual/serial-modules   |   1 -
 .../modules/i386-virtual/storage-core-modules |   1 -
 .../d-i/modules/i386-virtual/virtio-modules   |   1 -
 .../d-i/modules/i386-virtual/vlan-modules     |   1 -
 debian.master/d-i/modules/i386/block-modules  |   1 -
 debian.master/d-i/modules/i386/crypto-modules |   1 -
 debian.master/d-i/modules/i386/fat-modules    |   1 -
 debian.master/d-i/modules/i386/fb-modules     |   1 -
 .../d-i/modules/i386/firewire-core-modules    |   1 -
 debian.master/d-i/modules/i386/floppy-modules |   1 -
 .../d-i/modules/i386/fs-core-modules          |   1 -
 .../d-i/modules/i386/fs-secondary-modules     |   1 -
 debian.master/d-i/modules/i386/input-modules  |   1 -
 debian.master/d-i/modules/i386/ipmi-modules   |   1 -
 debian.master/d-i/modules/i386/kernel-image   |   1 -
 debian.master/d-i/modules/i386/md-modules     |   1 -
 .../d-i/modules/i386/message-modules          |   1 -
 debian.master/d-i/modules/i386/mouse-modules  |   1 -
 .../d-i/modules/i386/multipath-modules        |   1 -
 debian.master/d-i/modules/i386/nfs-modules    |   1 -
 debian.master/d-i/modules/i386/nic-modules    |   1 -
 .../d-i/modules/i386/nic-pcmcia-modules       |   1 -
 .../d-i/modules/i386/nic-shared-modules       |   1 -
 .../d-i/modules/i386/nic-usb-modules          |   1 -
 .../d-i/modules/i386/parport-modules          |   1 -
 debian.master/d-i/modules/i386/pata-modules   |   1 -
 debian.master/d-i/modules/i386/pcmcia-modules |   1 -
 .../d-i/modules/i386/pcmcia-storage-modules   |   1 -
 debian.master/d-i/modules/i386/plip-modules   |   1 -
 debian.master/d-i/modules/i386/ppp-modules    |   1 -
 debian.master/d-i/modules/i386/sata-modules   |   1 -
 debian.master/d-i/modules/i386/scsi-modules   |   2 -
 debian.master/d-i/modules/i386/serial-modules |   1 -
 .../d-i/modules/i386/speakup-modules          |   1 -
 .../d-i/modules/i386/storage-core-modules     |   1 -
 debian.master/d-i/modules/i386/usb-modules    |   1 -
 debian.master/d-i/modules/i386/virtio-modules |   1 -
 debian.master/d-i/modules/i386/vlan-modules   |   1 -
 debian.master/d-i/modules/input-modules       |  71 ------
 debian.master/d-i/modules/ipmi-modules        |   5 -
 debian.master/d-i/modules/kernel-image        |  31 ---
 debian.master/d-i/modules/md-modules          |  16 --
 debian.master/d-i/modules/message-modules     |   9 -
 .../d-i/modules/message-modules.powerpc       |   7 -
 debian.master/d-i/modules/mouse-modules       |   2 -
 debian.master/d-i/modules/multipath-modules   |   4 -
 debian.master/d-i/modules/nfs-modules         |   6 -
 debian.master/d-i/modules/nic-modules         | 209 ------------------
 debian.master/d-i/modules/nic-modules.powerpc | 152 -------------
 debian.master/d-i/modules/nic-pcmcia-modules  |  19 --
 debian.master/d-i/modules/nic-shared-modules  |  26 ---
 debian.master/d-i/modules/nic-usb-modules     |  34 ---
 debian.master/d-i/modules/parport-modules     |   2 -
 debian.master/d-i/modules/pata-modules        |  47 ----
 debian.master/d-i/modules/pcmcia-modules      |   8 -
 .../d-i/modules/pcmcia-storage-modules        |   6 -
 debian.master/d-i/modules/plip-modules        |   1 -
 .../d-i/modules/ppc64el/block-modules         |   1 -
 .../d-i/modules/ppc64el/crypto-modules        |   1 -
 .../d-i/modules/ppc64el/floppy-modules        |   1 -
 .../d-i/modules/ppc64el/fs-core-modules       |   1 -
 .../d-i/modules/ppc64el/fs-secondary-modules  |   1 -
 .../d-i/modules/ppc64el/input-modules         |   1 -
 .../d-i/modules/ppc64el/ipmi-modules          |   1 -
 .../d-i/modules/ppc64el/kernel-image          |   1 -
 debian.master/d-i/modules/ppc64el/md-modules  |   1 -
 .../d-i/modules/ppc64el/message-modules       |   1 -
 .../d-i/modules/ppc64el/multipath-modules     |   1 -
 debian.master/d-i/modules/ppc64el/nfs-modules |   1 -
 debian.master/d-i/modules/ppc64el/nic-modules |   1 -
 .../d-i/modules/ppc64el/nic-shared-modules    |   1 -
 .../d-i/modules/ppc64el/nic-usb-modules       |   1 -
 .../d-i/modules/ppc64el/parport-modules       |   1 -
 .../d-i/modules/ppc64el/plip-modules          |   1 -
 debian.master/d-i/modules/ppc64el/ppp-modules |   1 -
 .../d-i/modules/ppc64el/sata-modules          |   1 -
 .../d-i/modules/ppc64el/scsi-modules          |   1 -
 .../d-i/modules/ppc64el/storage-core-modules  |   2 -
 .../d-i/modules/ppc64el/virtio-modules        |   1 -
 .../d-i/modules/ppc64el/vlan-modules          |   1 -
 debian.master/d-i/modules/ppp-modules         |   6 -
 debian.master/d-i/modules/s390x/block-modules |   1 -
 .../d-i/modules/s390x/crypto-modules          |   2 -
 .../d-i/modules/s390x/dasd-extra-modules      |   1 -
 debian.master/d-i/modules/s390x/dasd-modules  |   1 -
 debian.master/d-i/modules/s390x/fat-modules   |   1 -
 .../d-i/modules/s390x/fs-core-modules         |   1 -
 .../d-i/modules/s390x/fs-secondary-modules    |   1 -
 debian.master/d-i/modules/s390x/kernel-image  |   1 -
 debian.master/d-i/modules/s390x/md-modules    |   1 -
 .../d-i/modules/s390x/multipath-modules       |   1 -
 debian.master/d-i/modules/s390x/nfs-modules   |   1 -
 debian.master/d-i/modules/s390x/nic-modules   |   1 -
 .../d-i/modules/s390x/nic-shared-modules      |   1 -
 debian.master/d-i/modules/s390x/scsi-modules  |   2 -
 .../d-i/modules/s390x/storage-core-modules    |   1 -
 .../d-i/modules/s390x/virtio-modules          |   1 -
 debian.master/d-i/modules/s390x/vlan-modules  |   1 -
 debian.master/d-i/modules/sata-modules        |  18 --
 debian.master/d-i/modules/scsi-modules        | 137 ------------
 .../d-i/modules/scsi-modules.powerpc          | 118 ----------
 debian.master/d-i/modules/serial-modules      |   4 -
 debian.master/d-i/modules/speakup-modules     |  16 --
 .../d-i/modules/storage-core-modules          |  15 --
 .../d-i/modules/storage-core-modules.powerpc  |  13 --
 debian.master/d-i/modules/usb-modules         |  15 --
 debian.master/d-i/modules/virtio-modules      |  11 -
 debian.master/d-i/modules/vlan-modules        |   3 -
 debian.master/d-i/package-list                | 203 -----------------
 263 files changed, 1681 deletions(-)
 delete mode 100644 debian.master/d-i/firmware/README.txt
 delete mode 100644 debian.master/d-i/firmware/amd64/README.txt
 delete mode 100644 debian.master/d-i/firmware/amd64/nic-modules
 delete mode 100644 debian.master/d-i/firmware/amd64/scsi-modules
 delete mode 100644 debian.master/d-i/firmware/arm64/README.txt
 delete mode 100644 debian.master/d-i/firmware/arm64/nic-modules
 delete mode 100644 debian.master/d-i/firmware/arm64/scsi-modules
 delete mode 100644 debian.master/d-i/firmware/armhf/README.txt
 delete mode 100644 debian.master/d-i/firmware/i386/README.txt
 delete mode 100644 debian.master/d-i/firmware/i386/nic-modules
 delete mode 100644 debian.master/d-i/firmware/i386/scsi-modules
 delete mode 100644 debian.master/d-i/firmware/nic-modules
 delete mode 100644 debian.master/d-i/firmware/powerpc/README.txt
 delete mode 100644 debian.master/d-i/firmware/powerpc/nic-modules
 delete mode 100644 debian.master/d-i/firmware/powerpc/scsi-modules
 delete mode 100644 debian.master/d-i/firmware/ppc64el/README.txt
 delete mode 100644 debian.master/d-i/firmware/ppc64el/nic-modules
 delete mode 100644 debian.master/d-i/firmware/ppc64el/scsi-modules
 delete mode 100644 debian.master/d-i/firmware/s390x/README.txt
 delete mode 100644 debian.master/d-i/firmware/s390x/nic-modules
 delete mode 100644 debian.master/d-i/firmware/s390x/scsi-modules
 delete mode 100644 debian.master/d-i/firmware/scsi-modules
 delete mode 100644 debian.master/d-i/kernel-versions
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/block-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/crypto-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/fat-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/fb-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/floppy-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/kernel-image
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/md-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/message-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/mouse-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/multipath-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/nic-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/parport-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/scsi-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/serial-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/virtio-modules
 delete mode 100644 debian.master/d-i/modules/amd64-virtual/vlan-modules
 delete mode 100644 debian.master/d-i/modules/amd64/block-modules
 delete mode 100644 debian.master/d-i/modules/amd64/crypto-modules
 delete mode 100644 debian.master/d-i/modules/amd64/fat-modules
 delete mode 100644 debian.master/d-i/modules/amd64/fb-modules
 delete mode 100644 debian.master/d-i/modules/amd64/firewire-core-modules
 delete mode 100644 debian.master/d-i/modules/amd64/floppy-modules
 delete mode 100644 debian.master/d-i/modules/amd64/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/amd64/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/amd64/input-modules
 delete mode 100644 debian.master/d-i/modules/amd64/ipmi-modules
 delete mode 100644 debian.master/d-i/modules/amd64/kernel-image
 delete mode 100644 debian.master/d-i/modules/amd64/md-modules
 delete mode 100644 debian.master/d-i/modules/amd64/message-modules
 delete mode 100644 debian.master/d-i/modules/amd64/mouse-modules
 delete mode 100644 debian.master/d-i/modules/amd64/multipath-modules
 delete mode 100644 debian.master/d-i/modules/amd64/nfs-modules
 delete mode 100644 debian.master/d-i/modules/amd64/nic-modules
 delete mode 100644 debian.master/d-i/modules/amd64/nic-pcmcia-modules
 delete mode 100644 debian.master/d-i/modules/amd64/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/amd64/nic-usb-modules
 delete mode 100644 debian.master/d-i/modules/amd64/parport-modules
 delete mode 100644 debian.master/d-i/modules/amd64/pata-modules
 delete mode 100644 debian.master/d-i/modules/amd64/pcmcia-modules
 delete mode 100644 debian.master/d-i/modules/amd64/pcmcia-storage-modules
 delete mode 100644 debian.master/d-i/modules/amd64/plip-modules
 delete mode 100644 debian.master/d-i/modules/amd64/ppp-modules
 delete mode 100644 debian.master/d-i/modules/amd64/sata-modules
 delete mode 100644 debian.master/d-i/modules/amd64/scsi-modules
 delete mode 100644 debian.master/d-i/modules/amd64/serial-modules
 delete mode 100644 debian.master/d-i/modules/amd64/speakup-modules
 delete mode 100644 debian.master/d-i/modules/amd64/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/amd64/usb-modules
 delete mode 100644 debian.master/d-i/modules/amd64/virtio-modules
 delete mode 100644 debian.master/d-i/modules/amd64/vlan-modules
 delete mode 100644 debian.master/d-i/modules/arm64/block-modules
 delete mode 100644 debian.master/d-i/modules/arm64/crypto-modules
 delete mode 100644 debian.master/d-i/modules/arm64/fat-modules
 delete mode 100644 debian.master/d-i/modules/arm64/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/arm64/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/arm64/input-modules
 delete mode 100644 debian.master/d-i/modules/arm64/ipmi-modules
 delete mode 100644 debian.master/d-i/modules/arm64/kernel-image
 delete mode 100644 debian.master/d-i/modules/arm64/md-modules
 delete mode 100644 debian.master/d-i/modules/arm64/message-modules
 delete mode 100644 debian.master/d-i/modules/arm64/mouse-modules
 delete mode 100644 debian.master/d-i/modules/arm64/multipath-modules
 delete mode 100644 debian.master/d-i/modules/arm64/nfs-modules
 delete mode 100644 debian.master/d-i/modules/arm64/nic-modules
 delete mode 100644 debian.master/d-i/modules/arm64/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/arm64/nic-usb-modules
 delete mode 100644 debian.master/d-i/modules/arm64/parport-modules
 delete mode 100644 debian.master/d-i/modules/arm64/plip-modules
 delete mode 100644 debian.master/d-i/modules/arm64/ppp-modules
 delete mode 100644 debian.master/d-i/modules/arm64/sata-modules
 delete mode 100644 debian.master/d-i/modules/arm64/scsi-modules
 delete mode 100644 debian.master/d-i/modules/arm64/speakup-modules
 delete mode 100644 debian.master/d-i/modules/arm64/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/arm64/usb-modules
 delete mode 100644 debian.master/d-i/modules/arm64/virtio-modules
 delete mode 100644 debian.master/d-i/modules/arm64/vlan-modules
 delete mode 100644 debian.master/d-i/modules/armhf/block-modules
 delete mode 100644 debian.master/d-i/modules/armhf/crypto-modules
 delete mode 100644 debian.master/d-i/modules/armhf/fat-modules
 delete mode 100644 debian.master/d-i/modules/armhf/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/armhf/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/armhf/input-modules
 delete mode 100644 debian.master/d-i/modules/armhf/ipmi-modules
 delete mode 100644 debian.master/d-i/modules/armhf/kernel-image
 delete mode 100644 debian.master/d-i/modules/armhf/md-modules
 delete mode 100644 debian.master/d-i/modules/armhf/mouse-modules
 delete mode 100644 debian.master/d-i/modules/armhf/multipath-modules
 delete mode 100644 debian.master/d-i/modules/armhf/nfs-modules
 delete mode 100644 debian.master/d-i/modules/armhf/nic-modules
 delete mode 100644 debian.master/d-i/modules/armhf/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/armhf/nic-usb-modules
 delete mode 100644 debian.master/d-i/modules/armhf/parport-modules
 delete mode 100644 debian.master/d-i/modules/armhf/plip-modules
 delete mode 100644 debian.master/d-i/modules/armhf/ppp-modules
 delete mode 100644 debian.master/d-i/modules/armhf/sata-modules
 delete mode 100644 debian.master/d-i/modules/armhf/scsi-modules
 delete mode 100644 debian.master/d-i/modules/armhf/speakup-modules
 delete mode 100644 debian.master/d-i/modules/armhf/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/armhf/usb-modules
 delete mode 100644 debian.master/d-i/modules/armhf/vlan-modules
 delete mode 100644 debian.master/d-i/modules/block-modules
 delete mode 100644 debian.master/d-i/modules/block-modules.powerpc
 delete mode 100644 debian.master/d-i/modules/crypto-modules
 delete mode 100644 debian.master/d-i/modules/dasd-extra-modules.s390x
 delete mode 100644 debian.master/d-i/modules/dasd-modules.s390x
 delete mode 100644 debian.master/d-i/modules/fat-modules
 delete mode 100644 debian.master/d-i/modules/fb-modules
 delete mode 100644 debian.master/d-i/modules/firewire-core-modules
 delete mode 100644 debian.master/d-i/modules/floppy-modules
 delete mode 100644 debian.master/d-i/modules/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/block-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/crypto-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/fat-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/fb-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/floppy-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/kernel-image
 delete mode 100644 debian.master/d-i/modules/i386-virtual/md-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/message-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/mouse-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/multipath-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/nic-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/parport-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/scsi-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/serial-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/virtio-modules
 delete mode 100644 debian.master/d-i/modules/i386-virtual/vlan-modules
 delete mode 100644 debian.master/d-i/modules/i386/block-modules
 delete mode 100644 debian.master/d-i/modules/i386/crypto-modules
 delete mode 100644 debian.master/d-i/modules/i386/fat-modules
 delete mode 100644 debian.master/d-i/modules/i386/fb-modules
 delete mode 100644 debian.master/d-i/modules/i386/firewire-core-modules
 delete mode 100644 debian.master/d-i/modules/i386/floppy-modules
 delete mode 100644 debian.master/d-i/modules/i386/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/i386/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/i386/input-modules
 delete mode 100644 debian.master/d-i/modules/i386/ipmi-modules
 delete mode 100644 debian.master/d-i/modules/i386/kernel-image
 delete mode 100644 debian.master/d-i/modules/i386/md-modules
 delete mode 100644 debian.master/d-i/modules/i386/message-modules
 delete mode 100644 debian.master/d-i/modules/i386/mouse-modules
 delete mode 100644 debian.master/d-i/modules/i386/multipath-modules
 delete mode 100644 debian.master/d-i/modules/i386/nfs-modules
 delete mode 100644 debian.master/d-i/modules/i386/nic-modules
 delete mode 100644 debian.master/d-i/modules/i386/nic-pcmcia-modules
 delete mode 100644 debian.master/d-i/modules/i386/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/i386/nic-usb-modules
 delete mode 100644 debian.master/d-i/modules/i386/parport-modules
 delete mode 100644 debian.master/d-i/modules/i386/pata-modules
 delete mode 100644 debian.master/d-i/modules/i386/pcmcia-modules
 delete mode 100644 debian.master/d-i/modules/i386/pcmcia-storage-modules
 delete mode 100644 debian.master/d-i/modules/i386/plip-modules
 delete mode 100644 debian.master/d-i/modules/i386/ppp-modules
 delete mode 100644 debian.master/d-i/modules/i386/sata-modules
 delete mode 100644 debian.master/d-i/modules/i386/scsi-modules
 delete mode 100644 debian.master/d-i/modules/i386/serial-modules
 delete mode 100644 debian.master/d-i/modules/i386/speakup-modules
 delete mode 100644 debian.master/d-i/modules/i386/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/i386/usb-modules
 delete mode 100644 debian.master/d-i/modules/i386/virtio-modules
 delete mode 100644 debian.master/d-i/modules/i386/vlan-modules
 delete mode 100644 debian.master/d-i/modules/input-modules
 delete mode 100644 debian.master/d-i/modules/ipmi-modules
 delete mode 100644 debian.master/d-i/modules/kernel-image
 delete mode 100644 debian.master/d-i/modules/md-modules
 delete mode 100644 debian.master/d-i/modules/message-modules
 delete mode 100644 debian.master/d-i/modules/message-modules.powerpc
 delete mode 100644 debian.master/d-i/modules/mouse-modules
 delete mode 100644 debian.master/d-i/modules/multipath-modules
 delete mode 100644 debian.master/d-i/modules/nfs-modules
 delete mode 100644 debian.master/d-i/modules/nic-modules
 delete mode 100644 debian.master/d-i/modules/nic-modules.powerpc
 delete mode 100644 debian.master/d-i/modules/nic-pcmcia-modules
 delete mode 100644 debian.master/d-i/modules/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/nic-usb-modules
 delete mode 100644 debian.master/d-i/modules/parport-modules
 delete mode 100644 debian.master/d-i/modules/pata-modules
 delete mode 100644 debian.master/d-i/modules/pcmcia-modules
 delete mode 100644 debian.master/d-i/modules/pcmcia-storage-modules
 delete mode 100644 debian.master/d-i/modules/plip-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/block-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/crypto-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/floppy-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/input-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/ipmi-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/kernel-image
 delete mode 100644 debian.master/d-i/modules/ppc64el/md-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/message-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/multipath-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/nfs-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/nic-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/nic-usb-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/parport-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/plip-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/ppp-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/sata-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/scsi-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/virtio-modules
 delete mode 100644 debian.master/d-i/modules/ppc64el/vlan-modules
 delete mode 100644 debian.master/d-i/modules/ppp-modules
 delete mode 100644 debian.master/d-i/modules/s390x/block-modules
 delete mode 100644 debian.master/d-i/modules/s390x/crypto-modules
 delete mode 100644 debian.master/d-i/modules/s390x/dasd-extra-modules
 delete mode 100644 debian.master/d-i/modules/s390x/dasd-modules
 delete mode 100644 debian.master/d-i/modules/s390x/fat-modules
 delete mode 100644 debian.master/d-i/modules/s390x/fs-core-modules
 delete mode 100644 debian.master/d-i/modules/s390x/fs-secondary-modules
 delete mode 100644 debian.master/d-i/modules/s390x/kernel-image
 delete mode 100644 debian.master/d-i/modules/s390x/md-modules
 delete mode 100644 debian.master/d-i/modules/s390x/multipath-modules
 delete mode 100644 debian.master/d-i/modules/s390x/nfs-modules
 delete mode 100644 debian.master/d-i/modules/s390x/nic-modules
 delete mode 100644 debian.master/d-i/modules/s390x/nic-shared-modules
 delete mode 100644 debian.master/d-i/modules/s390x/scsi-modules
 delete mode 100644 debian.master/d-i/modules/s390x/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/s390x/virtio-modules
 delete mode 100644 debian.master/d-i/modules/s390x/vlan-modules
 delete mode 100644 debian.master/d-i/modules/sata-modules
 delete mode 100644 debian.master/d-i/modules/scsi-modules
 delete mode 100644 debian.master/d-i/modules/scsi-modules.powerpc
 delete mode 100644 debian.master/d-i/modules/serial-modules
 delete mode 100644 debian.master/d-i/modules/speakup-modules
 delete mode 100644 debian.master/d-i/modules/storage-core-modules
 delete mode 100644 debian.master/d-i/modules/storage-core-modules.powerpc
 delete mode 100644 debian.master/d-i/modules/usb-modules
 delete mode 100644 debian.master/d-i/modules/virtio-modules
 delete mode 100644 debian.master/d-i/modules/vlan-modules
 delete mode 100644 debian.master/d-i/package-list

Comments

Paolo Pisati Nov. 8, 2021, 2:21 p.m. UTC | #1
On Mon, Nov 08, 2021 at 01:32:38PM +0000, Dimitri John Ledkov wrote:
> This patch bulk removes all the now unused /d-i/ udeb packaging input
> files.
diff mbox series

Patch

diff --git a/debian.master/d-i/firmware/README.txt b/debian.master/d-i/firmware/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/amd64/README.txt b/debian.master/d-i/firmware/amd64/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/amd64/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/amd64/nic-modules b/debian.master/d-i/firmware/amd64/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/firmware/amd64/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/firmware/amd64/scsi-modules b/debian.master/d-i/firmware/amd64/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/firmware/amd64/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/firmware/arm64/README.txt b/debian.master/d-i/firmware/arm64/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/arm64/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/arm64/nic-modules b/debian.master/d-i/firmware/arm64/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/firmware/arm64/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/firmware/arm64/scsi-modules b/debian.master/d-i/firmware/arm64/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/firmware/arm64/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/firmware/armhf/README.txt b/debian.master/d-i/firmware/armhf/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/armhf/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/i386/README.txt b/debian.master/d-i/firmware/i386/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/i386/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/i386/nic-modules b/debian.master/d-i/firmware/i386/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/firmware/i386/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/firmware/i386/scsi-modules b/debian.master/d-i/firmware/i386/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/firmware/i386/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
deleted file mode 100644
index f112ed218c..0000000000
--- a/debian.master/d-i/firmware/nic-modules
+++ /dev/null
@@ -1,14 +0,0 @@ 
-e100/d101m_ucode.bin ?
-e100/d101s_ucode.bin ?
-e100/d102e_ucode.bin ?
-bnx2/bnx2-mips-09-6.2.1b.fw ?
-bnx2/bnx2-rv2p-06-6.0.15.fw ?
-bnx2/bnx2-mips-06-6.2.3.fw ?
-bnx2/bnx2-rv2p-09-6.0.17.fw ?
-bnx2/bnx2-rv2p-09ax-6.0.17.fw ?
-bnx2x/bnx2x-e1h-7.12.30.0.fw ?
-bnx2x/bnx2x-e1-7.12.30.0.fw ?
-bnx2x/bnx2x-e2-7.12.30.0.fw ?
-tigon/tg3_tso5.bin ?
-tigon/tg3_tso.bin ?
-tigon/tg3.bin ?
diff --git a/debian.master/d-i/firmware/powerpc/README.txt b/debian.master/d-i/firmware/powerpc/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/powerpc/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/powerpc/nic-modules b/debian.master/d-i/firmware/powerpc/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/firmware/powerpc/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/firmware/powerpc/scsi-modules b/debian.master/d-i/firmware/powerpc/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/firmware/powerpc/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/firmware/ppc64el/README.txt b/debian.master/d-i/firmware/ppc64el/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/ppc64el/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/ppc64el/nic-modules b/debian.master/d-i/firmware/ppc64el/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/firmware/ppc64el/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/firmware/ppc64el/scsi-modules b/debian.master/d-i/firmware/ppc64el/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/firmware/ppc64el/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/firmware/s390x/README.txt b/debian.master/d-i/firmware/s390x/README.txt
deleted file mode 100644
index 27a8600bc0..0000000000
--- a/debian.master/d-i/firmware/s390x/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#
-# Place the names of udeb modules into this directory that require
-# runtime firmware.
-#
diff --git a/debian.master/d-i/firmware/s390x/nic-modules b/debian.master/d-i/firmware/s390x/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/firmware/s390x/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/firmware/s390x/scsi-modules b/debian.master/d-i/firmware/s390x/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/firmware/s390x/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/firmware/scsi-modules b/debian.master/d-i/firmware/scsi-modules
deleted file mode 100644
index 56bf990033..0000000000
--- a/debian.master/d-i/firmware/scsi-modules
+++ /dev/null
@@ -1,3 +0,0 @@ 
-qlogic/1040.bin ?
-qlogic/12160.bin ?
-qlogic/1280.bin ?
diff --git a/debian.master/d-i/kernel-versions b/debian.master/d-i/kernel-versions
deleted file mode 100644
index d0a73152e0..0000000000
--- a/debian.master/d-i/kernel-versions
+++ /dev/null
@@ -1,17 +0,0 @@ 
-# arch	version		flavour		installedname			suffix	bdep
-amd64	-		generic		-				-	-
-
-i386	-		generic		-				-	-
-
-armhf	-		generic		-				-	-
-armhf	-		generic-lpae	-				-	-
-
-arm64	-		generic		-				-	-
-arm64	-		generic-64k		-				-	-
-
-ppc64el	-		generic		-				-	-
-
-s390x	-		generic		-				-	-
-
-# Ports
-# arch	version		flavour		installedname			suffix	bdep
diff --git a/debian.master/d-i/modules/amd64-virtual/block-modules b/debian.master/d-i/modules/amd64-virtual/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/crypto-modules b/debian.master/d-i/modules/amd64-virtual/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/fat-modules b/debian.master/d-i/modules/amd64-virtual/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/fb-modules b/debian.master/d-i/modules/amd64-virtual/fb-modules
deleted file mode 100644
index aba524d902..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/fb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fb-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/floppy-modules b/debian.master/d-i/modules/amd64-virtual/floppy-modules
deleted file mode 100644
index bc84c4e4ca..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <floppy-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/fs-core-modules b/debian.master/d-i/modules/amd64-virtual/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/fs-secondary-modules b/debian.master/d-i/modules/amd64-virtual/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/kernel-image b/debian.master/d-i/modules/amd64-virtual/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/amd64-virtual/md-modules b/debian.master/d-i/modules/amd64-virtual/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/message-modules b/debian.master/d-i/modules/amd64-virtual/message-modules
deleted file mode 100644
index 9b060b3796..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/message-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <message-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/mouse-modules b/debian.master/d-i/modules/amd64-virtual/mouse-modules
deleted file mode 100644
index 15fcb00eaa..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <mouse-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/multipath-modules b/debian.master/d-i/modules/amd64-virtual/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/nic-modules b/debian.master/d-i/modules/amd64-virtual/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/nic-shared-modules b/debian.master/d-i/modules/amd64-virtual/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/parport-modules b/debian.master/d-i/modules/amd64-virtual/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/scsi-modules b/debian.master/d-i/modules/amd64-virtual/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/amd64-virtual/serial-modules b/debian.master/d-i/modules/amd64-virtual/serial-modules
deleted file mode 100644
index 6ab8b8c355..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/serial-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <serial-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/storage-core-modules b/debian.master/d-i/modules/amd64-virtual/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/virtio-modules b/debian.master/d-i/modules/amd64-virtual/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/amd64-virtual/vlan-modules b/debian.master/d-i/modules/amd64-virtual/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/amd64-virtual/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/amd64/block-modules b/debian.master/d-i/modules/amd64/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/amd64/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/amd64/crypto-modules b/debian.master/d-i/modules/amd64/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/amd64/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/amd64/fat-modules b/debian.master/d-i/modules/amd64/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/amd64/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/amd64/fb-modules b/debian.master/d-i/modules/amd64/fb-modules
deleted file mode 100644
index aba524d902..0000000000
--- a/debian.master/d-i/modules/amd64/fb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fb-modules>
diff --git a/debian.master/d-i/modules/amd64/firewire-core-modules b/debian.master/d-i/modules/amd64/firewire-core-modules
deleted file mode 100644
index dcac80af96..0000000000
--- a/debian.master/d-i/modules/amd64/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <firewire-core-modules>
diff --git a/debian.master/d-i/modules/amd64/floppy-modules b/debian.master/d-i/modules/amd64/floppy-modules
deleted file mode 100644
index bc84c4e4ca..0000000000
--- a/debian.master/d-i/modules/amd64/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <floppy-modules>
diff --git a/debian.master/d-i/modules/amd64/fs-core-modules b/debian.master/d-i/modules/amd64/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/amd64/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/amd64/fs-secondary-modules b/debian.master/d-i/modules/amd64/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/amd64/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/amd64/input-modules b/debian.master/d-i/modules/amd64/input-modules
deleted file mode 100644
index 5ecb595a4a..0000000000
--- a/debian.master/d-i/modules/amd64/input-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <input-modules>
diff --git a/debian.master/d-i/modules/amd64/ipmi-modules b/debian.master/d-i/modules/amd64/ipmi-modules
deleted file mode 100644
index d0fc97976d..0000000000
--- a/debian.master/d-i/modules/amd64/ipmi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ipmi-modules>
diff --git a/debian.master/d-i/modules/amd64/kernel-image b/debian.master/d-i/modules/amd64/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/amd64/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/amd64/md-modules b/debian.master/d-i/modules/amd64/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/amd64/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/amd64/message-modules b/debian.master/d-i/modules/amd64/message-modules
deleted file mode 100644
index 9b060b3796..0000000000
--- a/debian.master/d-i/modules/amd64/message-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <message-modules>
diff --git a/debian.master/d-i/modules/amd64/mouse-modules b/debian.master/d-i/modules/amd64/mouse-modules
deleted file mode 100644
index 15fcb00eaa..0000000000
--- a/debian.master/d-i/modules/amd64/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <mouse-modules>
diff --git a/debian.master/d-i/modules/amd64/multipath-modules b/debian.master/d-i/modules/amd64/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/amd64/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/amd64/nfs-modules b/debian.master/d-i/modules/amd64/nfs-modules
deleted file mode 100644
index 946fb8e442..0000000000
--- a/debian.master/d-i/modules/amd64/nfs-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nfs-modules>
diff --git a/debian.master/d-i/modules/amd64/nic-modules b/debian.master/d-i/modules/amd64/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/amd64/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/amd64/nic-pcmcia-modules b/debian.master/d-i/modules/amd64/nic-pcmcia-modules
deleted file mode 100644
index 7a0702cd55..0000000000
--- a/debian.master/d-i/modules/amd64/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-pcmcia-modules>
diff --git a/debian.master/d-i/modules/amd64/nic-shared-modules b/debian.master/d-i/modules/amd64/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/amd64/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/amd64/nic-usb-modules b/debian.master/d-i/modules/amd64/nic-usb-modules
deleted file mode 100644
index c479669b47..0000000000
--- a/debian.master/d-i/modules/amd64/nic-usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-usb-modules>
diff --git a/debian.master/d-i/modules/amd64/parport-modules b/debian.master/d-i/modules/amd64/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/amd64/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/amd64/pata-modules b/debian.master/d-i/modules/amd64/pata-modules
deleted file mode 100644
index b0cd6337a2..0000000000
--- a/debian.master/d-i/modules/amd64/pata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <pata-modules>
diff --git a/debian.master/d-i/modules/amd64/pcmcia-modules b/debian.master/d-i/modules/amd64/pcmcia-modules
deleted file mode 100644
index 2bb5350fe1..0000000000
--- a/debian.master/d-i/modules/amd64/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <pcmcia-modules>
diff --git a/debian.master/d-i/modules/amd64/pcmcia-storage-modules b/debian.master/d-i/modules/amd64/pcmcia-storage-modules
deleted file mode 100644
index f73ae5bb9b..0000000000
--- a/debian.master/d-i/modules/amd64/pcmcia-storage-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <pcmcia-storage-modules>
diff --git a/debian.master/d-i/modules/amd64/plip-modules b/debian.master/d-i/modules/amd64/plip-modules
deleted file mode 100644
index ca7a41bbc3..0000000000
--- a/debian.master/d-i/modules/amd64/plip-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <plip-modules>
diff --git a/debian.master/d-i/modules/amd64/ppp-modules b/debian.master/d-i/modules/amd64/ppp-modules
deleted file mode 100644
index 1f26aa1ee6..0000000000
--- a/debian.master/d-i/modules/amd64/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ppp-modules>
diff --git a/debian.master/d-i/modules/amd64/sata-modules b/debian.master/d-i/modules/amd64/sata-modules
deleted file mode 100644
index 01318c258b..0000000000
--- a/debian.master/d-i/modules/amd64/sata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sata-modules>
diff --git a/debian.master/d-i/modules/amd64/scsi-modules b/debian.master/d-i/modules/amd64/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/amd64/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/amd64/serial-modules b/debian.master/d-i/modules/amd64/serial-modules
deleted file mode 100644
index 6ab8b8c355..0000000000
--- a/debian.master/d-i/modules/amd64/serial-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <serial-modules>
diff --git a/debian.master/d-i/modules/amd64/speakup-modules b/debian.master/d-i/modules/amd64/speakup-modules
deleted file mode 100644
index 29592721a7..0000000000
--- a/debian.master/d-i/modules/amd64/speakup-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <speakup-modules>
diff --git a/debian.master/d-i/modules/amd64/storage-core-modules b/debian.master/d-i/modules/amd64/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/amd64/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/amd64/usb-modules b/debian.master/d-i/modules/amd64/usb-modules
deleted file mode 100644
index c598dedd81..0000000000
--- a/debian.master/d-i/modules/amd64/usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <usb-modules>
diff --git a/debian.master/d-i/modules/amd64/virtio-modules b/debian.master/d-i/modules/amd64/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/amd64/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/amd64/vlan-modules b/debian.master/d-i/modules/amd64/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/amd64/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/arm64/block-modules b/debian.master/d-i/modules/arm64/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/arm64/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/arm64/crypto-modules b/debian.master/d-i/modules/arm64/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/arm64/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/arm64/fat-modules b/debian.master/d-i/modules/arm64/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/arm64/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/arm64/fs-core-modules b/debian.master/d-i/modules/arm64/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/arm64/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/arm64/fs-secondary-modules b/debian.master/d-i/modules/arm64/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/arm64/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/arm64/input-modules b/debian.master/d-i/modules/arm64/input-modules
deleted file mode 100644
index 5ecb595a4a..0000000000
--- a/debian.master/d-i/modules/arm64/input-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <input-modules>
diff --git a/debian.master/d-i/modules/arm64/ipmi-modules b/debian.master/d-i/modules/arm64/ipmi-modules
deleted file mode 100644
index d0fc97976d..0000000000
--- a/debian.master/d-i/modules/arm64/ipmi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ipmi-modules>
diff --git a/debian.master/d-i/modules/arm64/kernel-image b/debian.master/d-i/modules/arm64/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/arm64/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/arm64/md-modules b/debian.master/d-i/modules/arm64/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/arm64/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/arm64/message-modules b/debian.master/d-i/modules/arm64/message-modules
deleted file mode 100644
index 9b060b3796..0000000000
--- a/debian.master/d-i/modules/arm64/message-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <message-modules>
diff --git a/debian.master/d-i/modules/arm64/mouse-modules b/debian.master/d-i/modules/arm64/mouse-modules
deleted file mode 100644
index 15fcb00eaa..0000000000
--- a/debian.master/d-i/modules/arm64/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <mouse-modules>
diff --git a/debian.master/d-i/modules/arm64/multipath-modules b/debian.master/d-i/modules/arm64/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/arm64/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/arm64/nfs-modules b/debian.master/d-i/modules/arm64/nfs-modules
deleted file mode 100644
index 946fb8e442..0000000000
--- a/debian.master/d-i/modules/arm64/nfs-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nfs-modules>
diff --git a/debian.master/d-i/modules/arm64/nic-modules b/debian.master/d-i/modules/arm64/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/arm64/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/arm64/nic-shared-modules b/debian.master/d-i/modules/arm64/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/arm64/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/arm64/nic-usb-modules b/debian.master/d-i/modules/arm64/nic-usb-modules
deleted file mode 100644
index c479669b47..0000000000
--- a/debian.master/d-i/modules/arm64/nic-usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-usb-modules>
diff --git a/debian.master/d-i/modules/arm64/parport-modules b/debian.master/d-i/modules/arm64/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/arm64/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/arm64/plip-modules b/debian.master/d-i/modules/arm64/plip-modules
deleted file mode 100644
index ca7a41bbc3..0000000000
--- a/debian.master/d-i/modules/arm64/plip-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <plip-modules>
diff --git a/debian.master/d-i/modules/arm64/ppp-modules b/debian.master/d-i/modules/arm64/ppp-modules
deleted file mode 100644
index 1f26aa1ee6..0000000000
--- a/debian.master/d-i/modules/arm64/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ppp-modules>
diff --git a/debian.master/d-i/modules/arm64/sata-modules b/debian.master/d-i/modules/arm64/sata-modules
deleted file mode 100644
index 01318c258b..0000000000
--- a/debian.master/d-i/modules/arm64/sata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sata-modules>
diff --git a/debian.master/d-i/modules/arm64/scsi-modules b/debian.master/d-i/modules/arm64/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/arm64/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/arm64/speakup-modules b/debian.master/d-i/modules/arm64/speakup-modules
deleted file mode 100644
index 29592721a7..0000000000
--- a/debian.master/d-i/modules/arm64/speakup-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <speakup-modules>
diff --git a/debian.master/d-i/modules/arm64/storage-core-modules b/debian.master/d-i/modules/arm64/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/arm64/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/arm64/usb-modules b/debian.master/d-i/modules/arm64/usb-modules
deleted file mode 100644
index c598dedd81..0000000000
--- a/debian.master/d-i/modules/arm64/usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <usb-modules>
diff --git a/debian.master/d-i/modules/arm64/virtio-modules b/debian.master/d-i/modules/arm64/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/arm64/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/arm64/vlan-modules b/debian.master/d-i/modules/arm64/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/arm64/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/armhf/block-modules b/debian.master/d-i/modules/armhf/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/armhf/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/armhf/crypto-modules b/debian.master/d-i/modules/armhf/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/armhf/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/armhf/fat-modules b/debian.master/d-i/modules/armhf/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/armhf/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/armhf/fs-core-modules b/debian.master/d-i/modules/armhf/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/armhf/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/armhf/fs-secondary-modules b/debian.master/d-i/modules/armhf/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/armhf/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/armhf/input-modules b/debian.master/d-i/modules/armhf/input-modules
deleted file mode 100644
index 5ecb595a4a..0000000000
--- a/debian.master/d-i/modules/armhf/input-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <input-modules>
diff --git a/debian.master/d-i/modules/armhf/ipmi-modules b/debian.master/d-i/modules/armhf/ipmi-modules
deleted file mode 100644
index d0fc97976d..0000000000
--- a/debian.master/d-i/modules/armhf/ipmi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ipmi-modules>
diff --git a/debian.master/d-i/modules/armhf/kernel-image b/debian.master/d-i/modules/armhf/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/armhf/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/armhf/md-modules b/debian.master/d-i/modules/armhf/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/armhf/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/armhf/mouse-modules b/debian.master/d-i/modules/armhf/mouse-modules
deleted file mode 100644
index 15fcb00eaa..0000000000
--- a/debian.master/d-i/modules/armhf/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <mouse-modules>
diff --git a/debian.master/d-i/modules/armhf/multipath-modules b/debian.master/d-i/modules/armhf/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/armhf/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/armhf/nfs-modules b/debian.master/d-i/modules/armhf/nfs-modules
deleted file mode 100644
index 946fb8e442..0000000000
--- a/debian.master/d-i/modules/armhf/nfs-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nfs-modules>
diff --git a/debian.master/d-i/modules/armhf/nic-modules b/debian.master/d-i/modules/armhf/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/armhf/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/armhf/nic-shared-modules b/debian.master/d-i/modules/armhf/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/armhf/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/armhf/nic-usb-modules b/debian.master/d-i/modules/armhf/nic-usb-modules
deleted file mode 100644
index c479669b47..0000000000
--- a/debian.master/d-i/modules/armhf/nic-usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-usb-modules>
diff --git a/debian.master/d-i/modules/armhf/parport-modules b/debian.master/d-i/modules/armhf/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/armhf/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/armhf/plip-modules b/debian.master/d-i/modules/armhf/plip-modules
deleted file mode 100644
index ca7a41bbc3..0000000000
--- a/debian.master/d-i/modules/armhf/plip-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <plip-modules>
diff --git a/debian.master/d-i/modules/armhf/ppp-modules b/debian.master/d-i/modules/armhf/ppp-modules
deleted file mode 100644
index 1f26aa1ee6..0000000000
--- a/debian.master/d-i/modules/armhf/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ppp-modules>
diff --git a/debian.master/d-i/modules/armhf/sata-modules b/debian.master/d-i/modules/armhf/sata-modules
deleted file mode 100644
index 01318c258b..0000000000
--- a/debian.master/d-i/modules/armhf/sata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sata-modules>
diff --git a/debian.master/d-i/modules/armhf/scsi-modules b/debian.master/d-i/modules/armhf/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/armhf/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/armhf/speakup-modules b/debian.master/d-i/modules/armhf/speakup-modules
deleted file mode 100644
index 29592721a7..0000000000
--- a/debian.master/d-i/modules/armhf/speakup-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <speakup-modules>
diff --git a/debian.master/d-i/modules/armhf/storage-core-modules b/debian.master/d-i/modules/armhf/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/armhf/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/armhf/usb-modules b/debian.master/d-i/modules/armhf/usb-modules
deleted file mode 100644
index c598dedd81..0000000000
--- a/debian.master/d-i/modules/armhf/usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <usb-modules>
diff --git a/debian.master/d-i/modules/armhf/vlan-modules b/debian.master/d-i/modules/armhf/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/armhf/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/block-modules b/debian.master/d-i/modules/block-modules
deleted file mode 100644
index 19f95757a4..0000000000
--- a/debian.master/d-i/modules/block-modules
+++ /dev/null
@@ -1,43 +0,0 @@ 
-aoe ?
-aten ?
-bcm2835 ?
-bpck ?
-bpck6 ?
-cciss ?
-comm ?
-cpqarray ?
-DAC960 ?
-dstr ?
-epat ?
-epia ?
-fit2 ?
-fit3 ?
-friq ?
-frpw ?
-hpsa ?
-hio ?
-kbic ?
-ktti ?
-nbd ?
-nvme ?
-on20 ?
-on26 ?
-paride ?
-pcd ?
-pd ?
-pf ?
-pg ?
-pt ?
-sdhci-tegra ?
-sx8 ?
-umem ?
-virtio_blk ?
-xen-blkfront ?
-mtip32xx ?
-mmc_block ?
-sdhci ?
-sdhci-pci ?
-sdhci-acpi ?
-tifm_sd ?
-dw_mmc ?
-dw_mmc_pltfm ?
diff --git a/debian.master/d-i/modules/block-modules.powerpc b/debian.master/d-i/modules/block-modules.powerpc
deleted file mode 100644
index ca126b7b16..0000000000
--- a/debian.master/d-i/modules/block-modules.powerpc
+++ /dev/null
@@ -1,31 +0,0 @@ 
-aoe ?
-aten ?
-bpck ?
-bpck6 ?
-cciss ?
-comm ?
-cpqarray ?
-DAC960 ?
-dstr ?
-epat ?
-epia ?
-fit2 ?
-fit3 ?
-friq ?
-frpw ?
-kbic ?
-ktti ?
-nbd ?
-on20 ?
-on26 ?
-paride ?
-pcd ?
-pd ?
-pf ?
-pg ?
-ps3disk ?
-ps3vram ?
-pt ?
-sx8 ?
-umem ?
-virtio_blk ?
diff --git a/debian.master/d-i/modules/crypto-modules b/debian.master/d-i/modules/crypto-modules
deleted file mode 100644
index 449677ae95..0000000000
--- a/debian.master/d-i/modules/crypto-modules
+++ /dev/null
@@ -1,78 +0,0 @@ 
-aesni-intel ?
-aes-x86_64 ?
-af_alg ?
-algif_hash ?
-algif_skcipher ?
-ansi_cprng ?
-anubis ?
-arc4 ?
-async_memcpy ?
-async_pq ?
-async_raid6_recov ?
-async_tx ?
-async_xor ?
-authenc ?
-authencesn ?
-blowfish_common ?
-blowfish_generic ?
-blowfish-x86_64 ?
-camellia ?
-cast5 ?
-cast6 ?
-ccm ?
-crc32_generic ?
-crc32c_generic ?
-crc32-vx_s390 ?
-cryptd ?
-cryptoloop ?
-crypto_null ?
-crypto_user ?
-ctr ?
-cts ?
-des_generic ?
-fcrypt ?
-gcm ?
-gf128mul ?
-ghash-clmulni-intel ?
-ghash-generic ?
-khazad ?
-lrw ?
-lzo ?
-md4 ?
-michael_mic ?
-padlock-aes ?
-padlock-sha ?
-paes_s390 ?
-pcbc ?
-pcrypt ?
-pkey ?
-raid6test ?
-rmd128 ?
-rmd160 ?
-rmd256 ?
-rmd320 ?
-salsa20_generic ?
-salsa20-x86_64 ?
-seed ?
-seqiv ?
-serpent_generic ?
-serpent-sse2-x86_64 ?
-sha1-ssse3 ?
-sha512_generic ?
-tcrypt ?
-tea ?
-tgr192 ?
-twofish_common ?
-twofish_generic ?
-twofish-x86_64 ?
-twofish-x86_64-3way ?
-vmac ?
-wp512 ?
-xcbc ?
-xor ?
-xts ?
-zcrypt ?
-zcrypt_cex2a ?
-zcrypt_cex4 ?
-zcrypt_pcixcc ?
-zlib ?
diff --git a/debian.master/d-i/modules/dasd-extra-modules.s390x b/debian.master/d-i/modules/dasd-extra-modules.s390x
deleted file mode 100644
index fff5ab6d49..0000000000
--- a/debian.master/d-i/modules/dasd-extra-modules.s390x
+++ /dev/null
@@ -1 +0,0 @@ 
-dasd_diag_mod ?
diff --git a/debian.master/d-i/modules/dasd-modules.s390x b/debian.master/d-i/modules/dasd-modules.s390x
deleted file mode 100644
index 8e6185b813..0000000000
--- a/debian.master/d-i/modules/dasd-modules.s390x
+++ /dev/null
@@ -1,3 +0,0 @@ 
-dasd_mod ?
-dasd_fba_mod ?
-dasd_eckd_mod ?
diff --git a/debian.master/d-i/modules/fat-modules b/debian.master/d-i/modules/fat-modules
deleted file mode 100644
index 0aa17c3810..0000000000
--- a/debian.master/d-i/modules/fat-modules
+++ /dev/null
@@ -1,7 +0,0 @@ 
-fat ?
-vfat ?
-
-# Supporting modules ?
-nls_cp437 ?
-nls_iso8859-1 ?
-nls_utf8 ?
diff --git a/debian.master/d-i/modules/fb-modules b/debian.master/d-i/modules/fb-modules
deleted file mode 100644
index eae829f89c..0000000000
--- a/debian.master/d-i/modules/fb-modules
+++ /dev/null
@@ -1,3 +0,0 @@ 
-fbcon ?
-vesafb ?
-vga16fb ?
diff --git a/debian.master/d-i/modules/firewire-core-modules b/debian.master/d-i/modules/firewire-core-modules
deleted file mode 100644
index dbb9229736..0000000000
--- a/debian.master/d-i/modules/firewire-core-modules
+++ /dev/null
@@ -1,4 +0,0 @@ 
-firewire-core ?
-firewire-ohci ?
-firewire-sbp2 ?
-firewire-net ?
diff --git a/debian.master/d-i/modules/floppy-modules b/debian.master/d-i/modules/floppy-modules
deleted file mode 100644
index ca8d7ffed6..0000000000
--- a/debian.master/d-i/modules/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-floppy ?
diff --git a/debian.master/d-i/modules/fs-core-modules b/debian.master/d-i/modules/fs-core-modules
deleted file mode 100644
index 8b78c4bf97..0000000000
--- a/debian.master/d-i/modules/fs-core-modules
+++ /dev/null
@@ -1,6 +0,0 @@ 
-ext2 ?
-ext4 ?
-jfs ?
-reiserfs ?
-xfs ?
-zfs ?
diff --git a/debian.master/d-i/modules/fs-secondary-modules b/debian.master/d-i/modules/fs-secondary-modules
deleted file mode 100644
index db46bb75fc..0000000000
--- a/debian.master/d-i/modules/fs-secondary-modules
+++ /dev/null
@@ -1,5 +0,0 @@ 
-btrfs ?
-fuse ?
-ntfs ?
-hfs ?
-hfsplus ?
diff --git a/debian.master/d-i/modules/i386-virtual/block-modules b/debian.master/d-i/modules/i386-virtual/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/i386-virtual/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/crypto-modules b/debian.master/d-i/modules/i386-virtual/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/i386-virtual/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/fat-modules b/debian.master/d-i/modules/i386-virtual/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/i386-virtual/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/fb-modules b/debian.master/d-i/modules/i386-virtual/fb-modules
deleted file mode 100644
index aba524d902..0000000000
--- a/debian.master/d-i/modules/i386-virtual/fb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fb-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/floppy-modules b/debian.master/d-i/modules/i386-virtual/floppy-modules
deleted file mode 100644
index bc84c4e4ca..0000000000
--- a/debian.master/d-i/modules/i386-virtual/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <floppy-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/fs-core-modules b/debian.master/d-i/modules/i386-virtual/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/i386-virtual/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/fs-secondary-modules b/debian.master/d-i/modules/i386-virtual/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/i386-virtual/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/kernel-image b/debian.master/d-i/modules/i386-virtual/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/i386-virtual/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/i386-virtual/md-modules b/debian.master/d-i/modules/i386-virtual/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/i386-virtual/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/message-modules b/debian.master/d-i/modules/i386-virtual/message-modules
deleted file mode 100644
index 9b060b3796..0000000000
--- a/debian.master/d-i/modules/i386-virtual/message-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <message-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/mouse-modules b/debian.master/d-i/modules/i386-virtual/mouse-modules
deleted file mode 100644
index 15fcb00eaa..0000000000
--- a/debian.master/d-i/modules/i386-virtual/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <mouse-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/multipath-modules b/debian.master/d-i/modules/i386-virtual/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/i386-virtual/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/nic-modules b/debian.master/d-i/modules/i386-virtual/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/i386-virtual/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/nic-shared-modules b/debian.master/d-i/modules/i386-virtual/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/i386-virtual/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/parport-modules b/debian.master/d-i/modules/i386-virtual/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/i386-virtual/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/scsi-modules b/debian.master/d-i/modules/i386-virtual/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/i386-virtual/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/i386-virtual/serial-modules b/debian.master/d-i/modules/i386-virtual/serial-modules
deleted file mode 100644
index 6ab8b8c355..0000000000
--- a/debian.master/d-i/modules/i386-virtual/serial-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <serial-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/storage-core-modules b/debian.master/d-i/modules/i386-virtual/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/i386-virtual/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/virtio-modules b/debian.master/d-i/modules/i386-virtual/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/i386-virtual/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/i386-virtual/vlan-modules b/debian.master/d-i/modules/i386-virtual/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/i386-virtual/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/i386/block-modules b/debian.master/d-i/modules/i386/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/i386/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/i386/crypto-modules b/debian.master/d-i/modules/i386/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/i386/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/i386/fat-modules b/debian.master/d-i/modules/i386/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/i386/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/i386/fb-modules b/debian.master/d-i/modules/i386/fb-modules
deleted file mode 100644
index aba524d902..0000000000
--- a/debian.master/d-i/modules/i386/fb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fb-modules>
diff --git a/debian.master/d-i/modules/i386/firewire-core-modules b/debian.master/d-i/modules/i386/firewire-core-modules
deleted file mode 100644
index dcac80af96..0000000000
--- a/debian.master/d-i/modules/i386/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <firewire-core-modules>
diff --git a/debian.master/d-i/modules/i386/floppy-modules b/debian.master/d-i/modules/i386/floppy-modules
deleted file mode 100644
index bc84c4e4ca..0000000000
--- a/debian.master/d-i/modules/i386/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <floppy-modules>
diff --git a/debian.master/d-i/modules/i386/fs-core-modules b/debian.master/d-i/modules/i386/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/i386/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/i386/fs-secondary-modules b/debian.master/d-i/modules/i386/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/i386/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/i386/input-modules b/debian.master/d-i/modules/i386/input-modules
deleted file mode 100644
index 5ecb595a4a..0000000000
--- a/debian.master/d-i/modules/i386/input-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <input-modules>
diff --git a/debian.master/d-i/modules/i386/ipmi-modules b/debian.master/d-i/modules/i386/ipmi-modules
deleted file mode 100644
index d0fc97976d..0000000000
--- a/debian.master/d-i/modules/i386/ipmi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ipmi-modules>
diff --git a/debian.master/d-i/modules/i386/kernel-image b/debian.master/d-i/modules/i386/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/i386/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/i386/md-modules b/debian.master/d-i/modules/i386/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/i386/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/i386/message-modules b/debian.master/d-i/modules/i386/message-modules
deleted file mode 100644
index 9b060b3796..0000000000
--- a/debian.master/d-i/modules/i386/message-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <message-modules>
diff --git a/debian.master/d-i/modules/i386/mouse-modules b/debian.master/d-i/modules/i386/mouse-modules
deleted file mode 100644
index 15fcb00eaa..0000000000
--- a/debian.master/d-i/modules/i386/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <mouse-modules>
diff --git a/debian.master/d-i/modules/i386/multipath-modules b/debian.master/d-i/modules/i386/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/i386/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/i386/nfs-modules b/debian.master/d-i/modules/i386/nfs-modules
deleted file mode 100644
index 946fb8e442..0000000000
--- a/debian.master/d-i/modules/i386/nfs-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nfs-modules>
diff --git a/debian.master/d-i/modules/i386/nic-modules b/debian.master/d-i/modules/i386/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/i386/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/i386/nic-pcmcia-modules b/debian.master/d-i/modules/i386/nic-pcmcia-modules
deleted file mode 100644
index 7a0702cd55..0000000000
--- a/debian.master/d-i/modules/i386/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-pcmcia-modules>
diff --git a/debian.master/d-i/modules/i386/nic-shared-modules b/debian.master/d-i/modules/i386/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/i386/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/i386/nic-usb-modules b/debian.master/d-i/modules/i386/nic-usb-modules
deleted file mode 100644
index c479669b47..0000000000
--- a/debian.master/d-i/modules/i386/nic-usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-usb-modules>
diff --git a/debian.master/d-i/modules/i386/parport-modules b/debian.master/d-i/modules/i386/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/i386/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/i386/pata-modules b/debian.master/d-i/modules/i386/pata-modules
deleted file mode 100644
index b0cd6337a2..0000000000
--- a/debian.master/d-i/modules/i386/pata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <pata-modules>
diff --git a/debian.master/d-i/modules/i386/pcmcia-modules b/debian.master/d-i/modules/i386/pcmcia-modules
deleted file mode 100644
index 2bb5350fe1..0000000000
--- a/debian.master/d-i/modules/i386/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <pcmcia-modules>
diff --git a/debian.master/d-i/modules/i386/pcmcia-storage-modules b/debian.master/d-i/modules/i386/pcmcia-storage-modules
deleted file mode 100644
index f73ae5bb9b..0000000000
--- a/debian.master/d-i/modules/i386/pcmcia-storage-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <pcmcia-storage-modules>
diff --git a/debian.master/d-i/modules/i386/plip-modules b/debian.master/d-i/modules/i386/plip-modules
deleted file mode 100644
index ca7a41bbc3..0000000000
--- a/debian.master/d-i/modules/i386/plip-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <plip-modules>
diff --git a/debian.master/d-i/modules/i386/ppp-modules b/debian.master/d-i/modules/i386/ppp-modules
deleted file mode 100644
index 1f26aa1ee6..0000000000
--- a/debian.master/d-i/modules/i386/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ppp-modules>
diff --git a/debian.master/d-i/modules/i386/sata-modules b/debian.master/d-i/modules/i386/sata-modules
deleted file mode 100644
index 01318c258b..0000000000
--- a/debian.master/d-i/modules/i386/sata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sata-modules>
diff --git a/debian.master/d-i/modules/i386/scsi-modules b/debian.master/d-i/modules/i386/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/i386/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/i386/serial-modules b/debian.master/d-i/modules/i386/serial-modules
deleted file mode 100644
index 6ab8b8c355..0000000000
--- a/debian.master/d-i/modules/i386/serial-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <serial-modules>
diff --git a/debian.master/d-i/modules/i386/speakup-modules b/debian.master/d-i/modules/i386/speakup-modules
deleted file mode 100644
index 29592721a7..0000000000
--- a/debian.master/d-i/modules/i386/speakup-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <speakup-modules>
diff --git a/debian.master/d-i/modules/i386/storage-core-modules b/debian.master/d-i/modules/i386/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/i386/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/i386/usb-modules b/debian.master/d-i/modules/i386/usb-modules
deleted file mode 100644
index c598dedd81..0000000000
--- a/debian.master/d-i/modules/i386/usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <usb-modules>
diff --git a/debian.master/d-i/modules/i386/virtio-modules b/debian.master/d-i/modules/i386/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/i386/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/i386/vlan-modules b/debian.master/d-i/modules/i386/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/i386/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/input-modules b/debian.master/d-i/modules/input-modules
deleted file mode 100644
index c6e1c7de3a..0000000000
--- a/debian.master/d-i/modules/input-modules
+++ /dev/null
@@ -1,71 +0,0 @@ 
-hid ?
-hid-a4tech ?
-hid-apple ?
-hid-appleir ?
-hid-aureal ?
-hid-belkin ?
-hid-bright ?
-hid-cherry ?
-hid-chicony ?
-hid-corsair ?
-hid-cp2112 ?
-hid-cypress ?
-hid-dell ?
-hid-elecom ?
-hid-elo ?
-hid-ezkey ?
-hid-generic ?
-hid-gfrm ?
-hid-gt683r ?
-hid-gyration ?
-hid-holtek-kbd ?
-hid-holtek-mouse ?
-hid-hyperv ?
-hid-kensington ?
-hid-keytouch ?
-hid-kye ?
-hid-lcpower ?
-hid-lenovo ?
-hid-logitech ?
-hid-logitech-dj ?
-hid-logitech-hidpp ?
-hid-magicmouse ?
-hid-microsoft ?
-hid-monterey ?
-hid-multitouch ?
-hid-ntrig ?
-hid-ortek ?
-hid-penmount ?
-hid-petalynx ?
-hid-picolcd ?
-hid-pl ?
-hid-plantronics ?
-hid-primax ?
-hid-rmi ?
-hid-roccat ?
-hid-roccat-arvo ?
-hid-roccat-common ?
-hid-roccat-isku ?
-hid-roccat-kone ?
-hid-roccat-koneplus ?
-hid-roccat-konepure ?
-hid-roccat-kovaplus ?
-hid-roccat-lua ?
-hid-roccat-pyra ?
-hid-roccat-ryos ?
-hid-roccat-savu ?
-hid-samsung ?
-hid-sony ?
-hid-speedlink ?
-hid-sunplus ?
-hid-thingm ?
-hid-tivo ?
-hid-topseed ?
-hid-twinhan ?
-hid-uclogic ?
-hid-waltop ?
-hid-wiimote ?
-hid-xinmo ?
-hid-zydacron ?
-uhid ?
-usbhid ?
diff --git a/debian.master/d-i/modules/ipmi-modules b/debian.master/d-i/modules/ipmi-modules
deleted file mode 100644
index d539daa145..0000000000
--- a/debian.master/d-i/modules/ipmi-modules
+++ /dev/null
@@ -1,5 +0,0 @@ 
-ipmi_devintf ?
-ipmi_msghandler ?
-ipmi_poweroff ?
-ipmi_si ?
-ipmi_watchdog ?
diff --git a/debian.master/d-i/modules/kernel-image b/debian.master/d-i/modules/kernel-image
deleted file mode 100644
index 02275ce037..0000000000
--- a/debian.master/d-i/modules/kernel-image
+++ /dev/null
@@ -1,31 +0,0 @@ 
-ast ?
-gpio-pca953x ?
-gpio-regulator ?
-hibmc-drm ?
-i2c-mux ?
-i2c-mux-pinctrl ?
-i2c-tegra ?
-max8907 ?
-max8907-regulator ?
-nvec ?
-nvec_kbd ?
-nvec_paz00 ?
-nvec_power ?
-nvec_ps2 ?
-palmas-regulator ?
-rtc-em3027 ?
-rtc-max8907 ?
-rtc-palmas ?
-rtc-tps6586x ?
-rtc-tps65910 ?
-tps51632-regulator ?
-tps62360-regulator ?
-tps65090-charger ?
-tps65090-regulator ?
-tps6586x-regulator ?
-tps65910-regulator ?
-host1x ?
-tegra-drm ?
-pwm_bl ?
-pwm-tegra ?
-panel-simple ?
diff --git a/debian.master/d-i/modules/md-modules b/debian.master/d-i/modules/md-modules
deleted file mode 100644
index 64217bf513..0000000000
--- a/debian.master/d-i/modules/md-modules
+++ /dev/null
@@ -1,16 +0,0 @@ 
-dm-crypt ?
-dm-mirror ?
-dm-raid ?
-dm-snapshot ?
-dm-zero ?
-faulty ?
-linear ?
-multipath ?
-raid0 ?
-raid1 ?
-raid10 ?
-raid456 ?
-
-# Extras
-dm-raid45 ?
-dm-loop ?
diff --git a/debian.master/d-i/modules/message-modules b/debian.master/d-i/modules/message-modules
deleted file mode 100644
index fd0e9e24b8..0000000000
--- a/debian.master/d-i/modules/message-modules
+++ /dev/null
@@ -1,9 +0,0 @@ 
-mptbase ?
-mptctl ?
-mptfc ?
-mptlan ?
-mptsas ?
-mpt2sas ?
-mpt3sas ?
-mptscsih ?
-mptspi ?
diff --git a/debian.master/d-i/modules/message-modules.powerpc b/debian.master/d-i/modules/message-modules.powerpc
deleted file mode 100644
index b9308e2663..0000000000
--- a/debian.master/d-i/modules/message-modules.powerpc
+++ /dev/null
@@ -1,7 +0,0 @@ 
-mptbase
-mptctl
-mptfc
-mptlan
-mptsas
-mptscsih
-mptspi
diff --git a/debian.master/d-i/modules/mouse-modules b/debian.master/d-i/modules/mouse-modules
deleted file mode 100644
index 7b06256488..0000000000
--- a/debian.master/d-i/modules/mouse-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-psmouse ?
-usbmouse ?
diff --git a/debian.master/d-i/modules/multipath-modules b/debian.master/d-i/modules/multipath-modules
deleted file mode 100644
index 6e4fad7314..0000000000
--- a/debian.master/d-i/modules/multipath-modules
+++ /dev/null
@@ -1,4 +0,0 @@ 
-dm-multipath ?
-dm-round-robin ?
-dm-service-time ?
-dm-queue-length ?
diff --git a/debian.master/d-i/modules/nfs-modules b/debian.master/d-i/modules/nfs-modules
deleted file mode 100644
index a08f538712..0000000000
--- a/debian.master/d-i/modules/nfs-modules
+++ /dev/null
@@ -1,6 +0,0 @@ 
-nfs ?
-nfs_acl ?
-nfsv3 ?
-lockd ?
-sunrpc ?
-cifs ?
diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules
deleted file mode 100644
index e3628396d1..0000000000
--- a/debian.master/d-i/modules/nic-modules
+++ /dev/null
@@ -1,209 +0,0 @@ 
-3c359 ?
-3c501 ?
-3c503 ?
-3c505 ?
-3c507 ?
-3c509 ?
-3c515 ?
-3c523 ?
-3c527 ?
-3c59x ?
-8139cp ?
-8139too ?
-82596 ?
-abyss ?
-ac3200 ?
-adm8211 ?
-airo ?
-airport ?
-alx ?
-amd8111e ?
-amd-xgbe ?
-aquantia ?
-arcnet ?
-arc-rawmode ?
-arc-rimi ?
-arlan ?
-at1700 ?
-ath5k ?
-ath9k ?
-ath9k_htc ?
-atl1 ?
-atl1c ?
-atl1e ?
-atl2 ?
-atmel ?
-atmel_pci ?
-b44 ?
-bcm87xx ?
-be2net ?
-bmac ?
-bnx2 ?
-bnx2x ?
-bnxt_en ?
-bonding ?
-brcmfmac ?
-brcmsmac ?
-broadcom ?
-xgmac ?
-cassini ?
-ccwgroup ?
-com20020 ?
-com20020-pci ?
-com90io ?
-com90xx ?
-cs89x0 ?
-ctcm ?
-cxgb4 ?
-de2104x ?
-de4x5 ?
-de600 ?
-de620 ?
-defxx ?
-depca ?
-dl2k ?
-dmfe ?
-dummy ?
-e100 ?
-e1000 ?
-e1000e ?
-e2100 ?
-eepro ?
-eepro100 ?
-eexpress ?
-enic ?
-epic100 ?
-eql ?
-es3210 ?
-eth16i ?
-ewrk3 ?
-fealnx ?
-forcedeth ?
-fsm ?
-ibmveth ?
-ibmvnic ?
-igb ?
-ps3_gelic ?
-hamachi ?
-hclge ?
-hermes ?
-hfi1 ?
-hinic ?
-hns_dsaf ?
-hns_enet_drv ?
-hns_mdio ?
-hns3 ?
-hp ?
-hp100 ?
-hp-plus ?
-i40e ?
-i40evf ?
-ibmtr ?
-ipddp ?
-ipw2100 ?
-ipw2200 ?
-iwl3945 ?
-iwl4965 ?
-iwl-legacy ?
-iwldvm ?
-iwlmvm ?
-iwlwifi ?
-ixgb ?
-ixgbe ?
-lance ?
-lanstreamer ?
-lcs ?
-lasi_82596 ?
-lne390 ?
-lp486e ?
-mace ?
-marvell ?
-mdio-thunder ?
-mlx4_core ?
-mlx4_en ?
-mlx5_core ?
-mv643xx_eth ?
-myri_sbus ?
-natsemi ?
-ne ?
-ne2 ?
-ne2k-pci ?
-ne3210 ?
-netconsole ?
-netiucv ?
-netsec ?
-netxen_nic ?
-ni5010 ?
-ni52 ?
-ni65 ?
-nicpf ?
-nicvf ?
-niu ?
-ns83820 ?
-olympic ?
-orinoco ?
-orinoco_pci ?
-orinoco_plx ?
-orinoco_tmd ?
-pcnet32 ?
-qcom-emac ?
-qede ?
-qeth ?
-qeth_l2 ?
-qeth_l3 ?
-qlcnic ?
-r815x ?
-r8169 ?
-rate_control ?
-realtek ?
-rfc1051 ?
-rfc1201 ?
-rrunner ?
-rt2400 ?
-rt2400pci ?
-rt2500 ?
-rt2500pci ?
-rt2800pci ?
-rt61pci ?
-s2io ?
-sfc ?
-shaper ?
-sis190 ?
-sis900 ?
-spidernet ?
-skfp ?
-skge ?
-sk98lin ?
-sky2 ?
-smc9194 ?
-smc-ultra ?
-smc-ultra32 ?
-starfire ?
-strip ?
-sunbmac ?
-sundance ?
-sungem ?
-sungem_phy ?
-sunhme ?
-sunlance ?
-sunqe ?
-sunvnet ?
-tg3 ?
-tlan ?
-tms380tr ?
-tmspci ?
-tulip ?
-tun ?
-typhoon ?
-uli526x ?
-via-rhine ?
-via-velocity ?
-virtio_net ?
-wavelan ?
-wd ?
-winbond-840 ?
-yellowfin ?
-znet ?
-vmxnet3 ?
-xen-netfront ?
-xgene-enet ?
diff --git a/debian.master/d-i/modules/nic-modules.powerpc b/debian.master/d-i/modules/nic-modules.powerpc
deleted file mode 100644
index 05c63ea79b..0000000000
--- a/debian.master/d-i/modules/nic-modules.powerpc
+++ /dev/null
@@ -1,152 +0,0 @@ 
-3c359 ?
-3c501 ?
-3c503 ?
-3c505 ?
-3c507 ?
-3c509 ?
-3c515 ?
-3c523 ?
-3c527 ?
-3c59x ?
-8139cp ?
-8139too ?
-82596 ?
-abyss ?
-ac3200 ?
-adm8211 ?
-airo ?
-airport ?
-amd8111e ?
-arc4 ?
-arcnet ?
-arc-rawmode ?
-arc-rimi ?
-arlan ?
-at1700 ?
-atl1 ?
-atl1e ?
-atl2 ?
-atmel ?
-atmel_pci ?
-b44 ?
-bcm43xx ?
-bcm43xx-mac80211 ?
-bmac ?
-bnx2 ?
-bnx2x ?
-bonding ?
-cassini ?
-com20020 ?
-com20020-pci ?
-com90io ?
-com90xx ?
-cs89x0 ?
-de2104x ?
-de4x5 ?
-de600 ?
-de620 ?
-defxx ?
-depca ?
-dl2k ?
-dmfe ?
-dummy ?
-e100 ?
-e1000 ?
-e1000e ?
-e2100 ?
-eepro ?
-eepro100 ?
-eexpress ?
-epic100 ?
-eql ?
-es3210 ?
-eth16i ?
-ewrk3 ?
-fealnx ?
-forcedeth ?
-igb ?
-hamachi ?
-hermes ?
-hp ?
-hp100 ?
-hp-plus ?
-ibmtr ?
-ibmveth ?
-ipddp ?
-ipw2100 ?
-ipw2200 ?
-ipw3945 ?
-ixgb ?
-lance ?
-lanstreamer ?
-lasi_82596 ?
-lne390 ?
-lp486e ?
-mace ?
-mv643xx_eth ?
-myri_sbus ?
-natsemi ?
-ne ?
-ne2 ?
-ne2k-pci ?
-ne3210 ?
-netconsole ?
-netxen_nic ?
-ni5010 ?
-ni52 ?
-ni65 ?
-niu ?
-ns83820 ?
-olympic ?
-orinoco ?
-orinoco_pci ?
-orinoco_plx ?
-orinoco_tmd ?
-pcnet32 ?
-ps3_gelic ?
-r8169 ?
-rate_control ?
-rfc1051 ?
-rfc1201 ?
-rrunner ?
-rt2400 ?
-rt2500 ?
-rt61pci ?
-s2io ?
-shaper ?
-sis190 ?
-sis900 ?
-spidernet ?
-skfp ?
-skge ?
-sk98lin ?
-sky2 ?
-smc9194 ?
-smc-ultra ?
-smc-ultra32 ?
-starfire ?
-strip ?
-sunbmac ?
-sundance ?
-sungem ?
-sungem_phy ?
-sunhme ?
-sunlance ?
-sunqe ?
-sunvnet ?
-tg3 ?
-tlan ?
-tms380tr ?
-tmspci ?
-tulip ?
-tun ?
-typhoon ?
-uli526x ?
-via-rhine ?
-via-velocity ?
-virtio_net ?
-wavelan ?
-wd ?
-winbond-840 ?
-yellowfin ?
-znet ?
diff --git a/debian.master/d-i/modules/nic-pcmcia-modules b/debian.master/d-i/modules/nic-pcmcia-modules
deleted file mode 100644
index 191687536f..0000000000
--- a/debian.master/d-i/modules/nic-pcmcia-modules
+++ /dev/null
@@ -1,19 +0,0 @@ 
-3c574_cs ?
-3c589_cs ?
-airo_cs ?
-atmel_cs ?
-axnet_cs ?
-com20020_cs ?
-fmvj18x_cs ?
-ibmtr_cs ?
-netwave_cs ?
-nmclan_cs ?
-orinoco_cs ?
-pcnet_cs ?
-ray_cs ?
-smc91c92_cs ?
-wavelan_cs ?
-wl3501_cs ?
-xirc2ps_cs ?
-xircom_cb ?
-xircom_tulip_cb ?
diff --git a/debian.master/d-i/modules/nic-shared-modules b/debian.master/d-i/modules/nic-shared-modules
deleted file mode 100644
index 0ee15aab43..0000000000
--- a/debian.master/d-i/modules/nic-shared-modules
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# PHY
-8390 ?
-mii ?
-
-# CRC modules
-crc-ccitt ?
-crc-itu-t ?
-libcrc32c ?
-
-# mac80211 stuff
-mac80211 ?
-cfg80211 ?
-
-# rt2x00 lib (since rt2x00 is split across usb/pci/cb
-rt2x00lib ?
-rt2800lib ?
-
-# Atheros library (since drivers are split across nic-modules/nic-usb-modules)
-ath ?
-
-# Wireless 802.11 modules
-lib80211 ?
-cfg80211 ?
-lib80211_crypt_ccmp ?
-lib80211_crypt_tkip ?
-lib80211_crypt_wep ?
diff --git a/debian.master/d-i/modules/nic-usb-modules b/debian.master/d-i/modules/nic-usb-modules
deleted file mode 100644
index 93d3d8c2d9..0000000000
--- a/debian.master/d-i/modules/nic-usb-modules
+++ /dev/null
@@ -1,34 +0,0 @@ 
-ax88179_178a ?
-catc ?
-kaweth ?
-pegasus ?
-prism2_usb ?
-rtl8150 ?
-usbnet ?
-zd1211rw ?
-zd1201 ?
-rt2500usb ?
-rt73usb ?
-rt2570 ?
-rt2800usb ?
-rt2x00usb ?
-cdc_ether ?
-asix ?
-cdc_eem ?
-cdc_ether ?
-cdc-phonet ?
-cdc_subset ?
-dm9601 ?
-gl620a ?
-hso ?
-int51x1 ?
-mcs7830 ?
-net1080 ?
-plusb ?
-rndis_host ?
-r8152 ?
-smsc95xx ?
-zaurus ?
-carl9170 ?
-smsc75xx ?
-smsc95xx ?
diff --git a/debian.master/d-i/modules/parport-modules b/debian.master/d-i/modules/parport-modules
deleted file mode 100644
index 75fe0b927c..0000000000
--- a/debian.master/d-i/modules/parport-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-parport ?
-parport_pc ?
diff --git a/debian.master/d-i/modules/pata-modules b/debian.master/d-i/modules/pata-modules
deleted file mode 100644
index a58c30a89c..0000000000
--- a/debian.master/d-i/modules/pata-modules
+++ /dev/null
@@ -1,47 +0,0 @@ 
-pata_ali.ko ?
-pata_amd.ko ?
-pata_artop.ko ?
-pata_atiixp.ko ?
-pata_atp867x.ko ?
-pata_cmd640.ko ?
-pata_cmd64x.ko ?
-pata_cs5520.ko ?
-pata_cs5530.ko ?
-pata_cs5535.ko ?
-pata_cs5536.ko ?
-pata_cypress.ko ?
-pata_efar.ko ?
-pata_hpt366.ko ?
-pata_hpt37x.ko ?
-pata_hpt3x2n.ko ?
-pata_hpt3x3.ko ?
-pata_isapnp.ko ?
-pata_it8213.ko ?
-pata_it821x.ko ?
-pata_jmicron.ko ?
-pata_legacy.ko ?
-pata_macio.ko ?
-pata_marvell.ko ?
-pata_mpiix.ko ?
-pata_netcell.ko ?
-pata_ninja32.ko ?
-pata_ns87410.ko ?
-pata_ns87415.ko ?
-pata_oldpiix.ko ?
-pata_optidma.ko ?
-pata_opti.ko ?
-pata_pcmcia.ko ?
-pata_pdc2027x.ko ?
-pata_pdc202xx_old.ko ?
-pata_qdi.ko ?
-pata_radisys.ko ?
-pata_rdc.ko ?
-pata_rz1000.ko ?
-pata_sc1200.ko ?
-pata_sch.ko ?
-pata_serverworks.ko ?
-pata_sil680.ko ?
-pata_sl82c105.ko ?
-pata_triflex.ko ?
-pata_via.ko ?
-pata_winbond.ko ?
diff --git a/debian.master/d-i/modules/pcmcia-modules b/debian.master/d-i/modules/pcmcia-modules
deleted file mode 100644
index 06a50311d5..0000000000
--- a/debian.master/d-i/modules/pcmcia-modules
+++ /dev/null
@@ -1,8 +0,0 @@ 
-i82092 ?
-i82365 ?
-pcmcia ?
-pcmcia_core ?
-pd6729 ?
-rsrc_nonstatic ?
-tcic ?
-yenta_socket ?
diff --git a/debian.master/d-i/modules/pcmcia-storage-modules b/debian.master/d-i/modules/pcmcia-storage-modules
deleted file mode 100644
index bb042a648a..0000000000
--- a/debian.master/d-i/modules/pcmcia-storage-modules
+++ /dev/null
@@ -1,6 +0,0 @@ 
-pata_pcmcia ?
-qlogic_cs ?
-fdomain_cs ?
-aha152x_cs ?
-nsp_cs ?
-sym53c500_cs ?
diff --git a/debian.master/d-i/modules/plip-modules b/debian.master/d-i/modules/plip-modules
deleted file mode 100644
index 446e2bd335..0000000000
--- a/debian.master/d-i/modules/plip-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-plip ?
diff --git a/debian.master/d-i/modules/ppc64el/block-modules b/debian.master/d-i/modules/ppc64el/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/ppc64el/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/ppc64el/crypto-modules b/debian.master/d-i/modules/ppc64el/crypto-modules
deleted file mode 100644
index 3a1e862b4c..0000000000
--- a/debian.master/d-i/modules/ppc64el/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <crypto-modules>
diff --git a/debian.master/d-i/modules/ppc64el/floppy-modules b/debian.master/d-i/modules/ppc64el/floppy-modules
deleted file mode 100644
index bc84c4e4ca..0000000000
--- a/debian.master/d-i/modules/ppc64el/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <floppy-modules>
diff --git a/debian.master/d-i/modules/ppc64el/fs-core-modules b/debian.master/d-i/modules/ppc64el/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/ppc64el/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/ppc64el/fs-secondary-modules b/debian.master/d-i/modules/ppc64el/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/ppc64el/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/ppc64el/input-modules b/debian.master/d-i/modules/ppc64el/input-modules
deleted file mode 100644
index 5ecb595a4a..0000000000
--- a/debian.master/d-i/modules/ppc64el/input-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <input-modules>
diff --git a/debian.master/d-i/modules/ppc64el/ipmi-modules b/debian.master/d-i/modules/ppc64el/ipmi-modules
deleted file mode 100644
index d0fc97976d..0000000000
--- a/debian.master/d-i/modules/ppc64el/ipmi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ipmi-modules>
diff --git a/debian.master/d-i/modules/ppc64el/kernel-image b/debian.master/d-i/modules/ppc64el/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/ppc64el/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/ppc64el/md-modules b/debian.master/d-i/modules/ppc64el/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/ppc64el/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/ppc64el/message-modules b/debian.master/d-i/modules/ppc64el/message-modules
deleted file mode 100644
index 9b060b3796..0000000000
--- a/debian.master/d-i/modules/ppc64el/message-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <message-modules>
diff --git a/debian.master/d-i/modules/ppc64el/multipath-modules b/debian.master/d-i/modules/ppc64el/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/ppc64el/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/ppc64el/nfs-modules b/debian.master/d-i/modules/ppc64el/nfs-modules
deleted file mode 100644
index 946fb8e442..0000000000
--- a/debian.master/d-i/modules/ppc64el/nfs-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nfs-modules>
diff --git a/debian.master/d-i/modules/ppc64el/nic-modules b/debian.master/d-i/modules/ppc64el/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/ppc64el/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/ppc64el/nic-shared-modules b/debian.master/d-i/modules/ppc64el/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/ppc64el/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/ppc64el/nic-usb-modules b/debian.master/d-i/modules/ppc64el/nic-usb-modules
deleted file mode 100644
index c479669b47..0000000000
--- a/debian.master/d-i/modules/ppc64el/nic-usb-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-usb-modules>
diff --git a/debian.master/d-i/modules/ppc64el/parport-modules b/debian.master/d-i/modules/ppc64el/parport-modules
deleted file mode 100644
index 83966f771e..0000000000
--- a/debian.master/d-i/modules/ppc64el/parport-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <parport-modules>
diff --git a/debian.master/d-i/modules/ppc64el/plip-modules b/debian.master/d-i/modules/ppc64el/plip-modules
deleted file mode 100644
index ca7a41bbc3..0000000000
--- a/debian.master/d-i/modules/ppc64el/plip-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <plip-modules>
diff --git a/debian.master/d-i/modules/ppc64el/ppp-modules b/debian.master/d-i/modules/ppc64el/ppp-modules
deleted file mode 100644
index 1f26aa1ee6..0000000000
--- a/debian.master/d-i/modules/ppc64el/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <ppp-modules>
diff --git a/debian.master/d-i/modules/ppc64el/sata-modules b/debian.master/d-i/modules/ppc64el/sata-modules
deleted file mode 100644
index 01318c258b..0000000000
--- a/debian.master/d-i/modules/ppc64el/sata-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <sata-modules>
diff --git a/debian.master/d-i/modules/ppc64el/scsi-modules b/debian.master/d-i/modules/ppc64el/scsi-modules
deleted file mode 100644
index 8909dfb794..0000000000
--- a/debian.master/d-i/modules/ppc64el/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <scsi-modules>
diff --git a/debian.master/d-i/modules/ppc64el/storage-core-modules b/debian.master/d-i/modules/ppc64el/storage-core-modules
deleted file mode 100644
index ebffb37302..0000000000
--- a/debian.master/d-i/modules/ppc64el/storage-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <storage-core-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/ppc64el/virtio-modules b/debian.master/d-i/modules/ppc64el/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/ppc64el/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/ppc64el/vlan-modules b/debian.master/d-i/modules/ppc64el/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/ppc64el/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/ppp-modules b/debian.master/d-i/modules/ppp-modules
deleted file mode 100644
index d4f6a923e2..0000000000
--- a/debian.master/d-i/modules/ppp-modules
+++ /dev/null
@@ -1,6 +0,0 @@ 
-ppp_async ?
-ppp_deflate ?
-ppp_mppe ?
-pppoe ?
-pppox ?
-ppp_synctty ?
diff --git a/debian.master/d-i/modules/s390x/block-modules b/debian.master/d-i/modules/s390x/block-modules
deleted file mode 100644
index f937d0e016..0000000000
--- a/debian.master/d-i/modules/s390x/block-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <block-modules>
diff --git a/debian.master/d-i/modules/s390x/crypto-modules b/debian.master/d-i/modules/s390x/crypto-modules
deleted file mode 100644
index 120faaa52c..0000000000
--- a/debian.master/d-i/modules/s390x/crypto-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <crypto-modules>
-deflate ?
diff --git a/debian.master/d-i/modules/s390x/dasd-extra-modules b/debian.master/d-i/modules/s390x/dasd-extra-modules
deleted file mode 100644
index 239bf3345d..0000000000
--- a/debian.master/d-i/modules/s390x/dasd-extra-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <dasd-extra-modules.s390x>
diff --git a/debian.master/d-i/modules/s390x/dasd-modules b/debian.master/d-i/modules/s390x/dasd-modules
deleted file mode 100644
index 26d9e8a47f..0000000000
--- a/debian.master/d-i/modules/s390x/dasd-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <dasd-modules.s390x>
diff --git a/debian.master/d-i/modules/s390x/fat-modules b/debian.master/d-i/modules/s390x/fat-modules
deleted file mode 100644
index 274584eb65..0000000000
--- a/debian.master/d-i/modules/s390x/fat-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fat-modules>
diff --git a/debian.master/d-i/modules/s390x/fs-core-modules b/debian.master/d-i/modules/s390x/fs-core-modules
deleted file mode 100644
index 024c2d7f4f..0000000000
--- a/debian.master/d-i/modules/s390x/fs-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-core-modules>
diff --git a/debian.master/d-i/modules/s390x/fs-secondary-modules b/debian.master/d-i/modules/s390x/fs-secondary-modules
deleted file mode 100644
index 3689f1859d..0000000000
--- a/debian.master/d-i/modules/s390x/fs-secondary-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <fs-secondary-modules>
diff --git a/debian.master/d-i/modules/s390x/kernel-image b/debian.master/d-i/modules/s390x/kernel-image
deleted file mode 100644
index 1d11b1921d..0000000000
--- a/debian.master/d-i/modules/s390x/kernel-image
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <kernel-image>
diff --git a/debian.master/d-i/modules/s390x/md-modules b/debian.master/d-i/modules/s390x/md-modules
deleted file mode 100644
index 26115e10b8..0000000000
--- a/debian.master/d-i/modules/s390x/md-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <md-modules>
diff --git a/debian.master/d-i/modules/s390x/multipath-modules b/debian.master/d-i/modules/s390x/multipath-modules
deleted file mode 100644
index a8b69b2537..0000000000
--- a/debian.master/d-i/modules/s390x/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <multipath-modules>
diff --git a/debian.master/d-i/modules/s390x/nfs-modules b/debian.master/d-i/modules/s390x/nfs-modules
deleted file mode 100644
index 946fb8e442..0000000000
--- a/debian.master/d-i/modules/s390x/nfs-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nfs-modules>
diff --git a/debian.master/d-i/modules/s390x/nic-modules b/debian.master/d-i/modules/s390x/nic-modules
deleted file mode 100644
index 2512e83950..0000000000
--- a/debian.master/d-i/modules/s390x/nic-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-modules>
diff --git a/debian.master/d-i/modules/s390x/nic-shared-modules b/debian.master/d-i/modules/s390x/nic-shared-modules
deleted file mode 100644
index cc84b14dcd..0000000000
--- a/debian.master/d-i/modules/s390x/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <nic-shared-modules>
diff --git a/debian.master/d-i/modules/s390x/scsi-modules b/debian.master/d-i/modules/s390x/scsi-modules
deleted file mode 100644
index c5e6593a7b..0000000000
--- a/debian.master/d-i/modules/s390x/scsi-modules
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include <scsi-modules>
-ipr ?
diff --git a/debian.master/d-i/modules/s390x/storage-core-modules b/debian.master/d-i/modules/s390x/storage-core-modules
deleted file mode 100644
index cb5278ea7a..0000000000
--- a/debian.master/d-i/modules/s390x/storage-core-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <storage-core-modules>
diff --git a/debian.master/d-i/modules/s390x/virtio-modules b/debian.master/d-i/modules/s390x/virtio-modules
deleted file mode 100644
index 61da39659c..0000000000
--- a/debian.master/d-i/modules/s390x/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <virtio-modules>
diff --git a/debian.master/d-i/modules/s390x/vlan-modules b/debian.master/d-i/modules/s390x/vlan-modules
deleted file mode 100644
index a8947e0b34..0000000000
--- a/debian.master/d-i/modules/s390x/vlan-modules
+++ /dev/null
@@ -1 +0,0 @@ 
-#include <vlan-modules>
diff --git a/debian.master/d-i/modules/sata-modules b/debian.master/d-i/modules/sata-modules
deleted file mode 100644
index 6a4171d188..0000000000
--- a/debian.master/d-i/modules/sata-modules
+++ /dev/null
@@ -1,18 +0,0 @@ 
-sata_inic162x.ko ?
-sata_mv.ko ?
-sata_nv.ko ?
-sata_promise.ko ?
-sata_qstor.ko ?
-sata_sil24.ko ?
-sata_sil.ko ?
-sata_sis.ko ?
-sata_svw.ko ?
-sata_sx4.ko ?
-sata_uli.ko ?
-sata_via.ko ?
-sata_vsc.ko ?
-ahci_platform ?
-ahci ?
-acard-ahci ?
-libahci ?
-ahci_xgene ?
diff --git a/debian.master/d-i/modules/scsi-modules b/debian.master/d-i/modules/scsi-modules
deleted file mode 100644
index 66923f331d..0000000000
--- a/debian.master/d-i/modules/scsi-modules
+++ /dev/null
@@ -1,137 +0,0 @@ 
-# SCSI
-raid_class ?
-scsi_transport_spi ?
-scsi_transport_fc ?
-scsi_transport_iscsi ?
-scsi_transport_sas ?
-sr_mod ?
-iscsi_tcp ?
-libiscsi ?
-amiga7xx ?
-a3000 ?
-a2091 ?
-gvp11 ?
-mvme147 ?
-sgiwd93 ?
-cyberstorm ?
-cyberstormII ?
-blz2060 ?
-blz1230 ?
-fastlane ?
-oktagon_esp_mod ?
-atari_scsi ?
-mac_scsi ?
-mac_esp ?
-sun3_scsi ?
-mvme16x ?
-bvme6000 ?
-sim710 ?
-advansys ?
-pm80xx ?
-psi240i ?
-BusLogic ?
-dpt_i2o ?
-u14-34f ?
-ultrastor ?
-aha152x ?
-aha1542 ?
-aha1740 ?
-aic7xxx_old ?
-ips ?
-fd_mcs ?
-fdomain ?
-fnic ?
-in2000 ?
-g_NCR5380 ?
-g_NCR5380_mmio ?
-NCR53c406a ?
-NCR_D700 ?
-NCR_Q720_mod ?
-sym53c416 ?
-qlogicfas408 ?
-qla1280 ?
-pas16 ?
-seagate ?
-seagate ?
-t128 ?
-dmx3191d ?
-dtc ?
-zalon7xx ?
-eata_pio ?
-wd7000 ?
-mca_53c9x ?
-ibmmca ?
-eata ?
-dc395x ?
-tmscsim ?
-megaraid ?
-atp870u ?
-esp ?
-gdth ?
-initio ?
-a100u2w ?
-qlogicpti ?
-ide-scsi ?
-mesh ?
-mac53c94 ?
-pluto ?
-dec_esp ?
-3w-xxxx ?
-3w-9xxx ?
-ppa ?
-imm ?
-jazz_esp ?
-sun3x_esp ?
-fcal ?
-lasi700 ?
-nsp32 ?
-hptiop ?
-stex ?
-osst ?
-sg ?
-ch ?
-scsi_debug ?
-aacraid ?
-aic7xxx ?
-aic79xx ?
-aic94xx ?
-arcmsr ?
-acornscsi_mod ?
-arxescsi ?
-cumana_1 ?
-cumana_2 ?
-ecoscsi ?
-oak ?
-powertec ?
-eesox ?
-ibmvscsi ?
-ibmvfc ?
-libsas ?
-lpfc ?
-megaraid_mm ?
-megaraid_mbox ?
-megaraid_sas ?
-qla2xxx ?
-sym53c8xx ?
-qla4xxx ?
-mvsas ?
-vmw_pvscsi ?
-ums-cypress ?
-be2iscsi ?
-3w-sas ?
-isci ?
-mlx4_ib ?
-mlx5_ib ?
-zfcp ?
-sd_mod ?
-hisi_sas_v2_hw ?
-hisi_sas_v3_hw ?
-iscsi_ibft ?
-
-# device handlers
-scsi_dh_alua ?
-scsi_dh_emc ?
-scsi_dh_rdac ?
-scsi_dh_hp_sw ?
-
-smartpqi ?
diff --git a/debian.master/d-i/modules/scsi-modules.powerpc b/debian.master/d-i/modules/scsi-modules.powerpc
deleted file mode 100644
index 2e77f6305b..0000000000
--- a/debian.master/d-i/modules/scsi-modules.powerpc
+++ /dev/null
@@ -1,118 +0,0 @@ 
-# SCSI
-raid_class ?
-scsi_transport_spi ?
-scsi_transport_fc ?
-scsi_transport_iscsi ?
-scsi_transport_sas ?
-iscsi_tcp ?
-libiscsi ?
-amiga7xx ?
-a3000 ?
-a2091 ?
-gvp11 ?
-mvme147 ?
-sgiwd93 ?
-cyberstorm ?
-cyberstormII ?
-blz2060 ?
-blz1230 ?
-fastlane ?
-oktagon_esp_mod ?
-atari_scsi ?
-mac_scsi ?
-mac_esp ?
-sun3_scsi ?
-mvme16x ?
-bvme6000 ?
-sim710 ?
-advansys ?
-psi240i ?
-BusLogic ?
-dpt_i2o ?
-u14-34f ?
-ultrastor ?
-aha152x ?
-aha1542 ?
-aha1740 ?
-aic7xxx_old ?
-ips ?
-fd_mcs ?
-fdomain ?
-in2000 ?
-g_NCR5380 ?
-g_NCR5380_mmio ?
-NCR53c406a ?
-NCR_D700 ?
-NCR_Q720_mod ?
-sym53c416 ?
-qlogicfas408 ?
-qla1280 ?
-pas16 ?
-seagate ?
-seagate ?
-t128 ?
-dmx3191d ?
-dtc ?
-zalon7xx ?
-eata_pio ?
-wd7000 ?
-mca_53c9x ?
-ibmmca ?
-ibmvfc ?
-ibmvscsi ?
-eata ?
-dc395x ?
-tmscsim ?
-megaraid ?
-atp870u ?
-esp ?
-gdth ?
-initio ?
-a100u2w ?
-qlogicpti ?
-ide-scsi ?
-mesh ?
-mac53c94 ?
-pluto ?
-dec_esp ?
-3w-xxxx ?
-3w-9xxx ?
-ppa ?
-imm ?
-jazz_esp ?
-sun3x_esp ?
-fcal ?
-lasi700 ?
-nsp32 ?
-ipr ?
-hptiop ?
-stex ?
-osst ?
-sg ?
-ch ?
-scsi_debug ?
-aacraid ?
-aic7xxx ?
-aic79xx ?
-aic94xx ?
-arcmsr ?
-acornscsi_mod ?
-arxescsi ?
-cumana_1 ?
-cumana_2 ?
-ecoscsi ?
-oak ?
-powertec ?
-eesox ?
-ibmvscsic ?
-libsas ?
-lpfc ?
-megaraid_mm ?
-megaraid_mbox ?
-megaraid_sas ?
-qla2xxx ?
-sym53c8xx ?
-qla4xxx ?
-mvsas ?
-sr_mod ?
-sd_mod ?
diff --git a/debian.master/d-i/modules/serial-modules b/debian.master/d-i/modules/serial-modules
deleted file mode 100644
index e170891418..0000000000
--- a/debian.master/d-i/modules/serial-modules
+++ /dev/null
@@ -1,4 +0,0 @@ 
-generic_serial ?
-serial_cs ?
-synclink_cs ?
-hyperv-keyboard ?
diff --git a/debian.master/d-i/modules/speakup-modules b/debian.master/d-i/modules/speakup-modules
deleted file mode 100644
index c3bef915ef..0000000000
--- a/debian.master/d-i/modules/speakup-modules
+++ /dev/null
@@ -1,16 +0,0 @@ 
-speakup ?
-speakup_acntpc ?
-speakup_acntsa ?
-speakup_apollo ?
-speakup_audptr ?
-speakup_bns ?
-speakup_decext ?
-speakup_dectlk ?
-speakup_dtlk ?
-speakup_dummy ?
-speakup_keypc ?
-speakup_ltlk ?
-speakup_soft ?
-speakup_spkout ?
-speakup_txprt ?
-speakup_decpc ?
diff --git a/debian.master/d-i/modules/storage-core-modules b/debian.master/d-i/modules/storage-core-modules
deleted file mode 100644
index a1f099d893..0000000000
--- a/debian.master/d-i/modules/storage-core-modules
+++ /dev/null
@@ -1,15 +0,0 @@ 
-# Core stacks
-usb-storage ?
-
-# Block level
-ata_piix ?
-ata_generic ?
-
-# Loop modules
-cryptoloop ?
-
-# Needs to be here for better cdrom initrd layout
-isofs ?
-
-# Needed for NVMe disks under VMD PCIe domains
-vmd ?
diff --git a/debian.master/d-i/modules/storage-core-modules.powerpc b/debian.master/d-i/modules/storage-core-modules.powerpc
deleted file mode 100644
index de158a9741..0000000000
--- a/debian.master/d-i/modules/storage-core-modules.powerpc
+++ /dev/null
@@ -1,13 +0,0 @@ 
-# Core stacks
-usb-storage ?
-
-# Block level
-
-# Loop modules
-cryptoloop
-
-# Needs to be here for better cdrom initrd layout
-isofs
-
-ps3stor_lib ?
-ps3rom ?
diff --git a/debian.master/d-i/modules/usb-modules b/debian.master/d-i/modules/usb-modules
deleted file mode 100644
index b93a66184e..0000000000
--- a/debian.master/d-i/modules/usb-modules
+++ /dev/null
@@ -1,15 +0,0 @@ 
-ehci-hcd ?
-isp116x-hcd ?
-isp1760 ?
-ohci-hcd ?
-r8a66597-hcd ?
-sl811_cs ?
-sl811-hcd ?
-u132-hcd ?
-uhci-hcd ?
-xhci-hcd ?
-xhci-plat-hcd ?
-ehci-tegra ?
-ehci-msm ?
-ehci-platform ?
-uas ?
diff --git a/debian.master/d-i/modules/virtio-modules b/debian.master/d-i/modules/virtio-modules
deleted file mode 100644
index a7bcbb758b..0000000000
--- a/debian.master/d-i/modules/virtio-modules
+++ /dev/null
@@ -1,11 +0,0 @@ 
-virtio_balloon ?
-virtio_pci ?
-virtio_ring ?
-virtio-rng ?
-virtio_scsi ?
-hv_vmbus ?
-hv_utils ?
-hv_netvsc ?
-hv_mouse ?
-hv_storvsc ?
-hv_balloon ?
diff --git a/debian.master/d-i/modules/vlan-modules b/debian.master/d-i/modules/vlan-modules
deleted file mode 100644
index 3d65a5592b..0000000000
--- a/debian.master/d-i/modules/vlan-modules
+++ /dev/null
@@ -1,3 +0,0 @@ 
-slp ?
-garp ?
-8021q ?
diff --git a/debian.master/d-i/package-list b/debian.master/d-i/package-list
deleted file mode 100644
index 1075910999..0000000000
--- a/debian.master/d-i/package-list
+++ /dev/null
@@ -1,203 +0,0 @@ 
-Package: kernel-image
-Provides: ext3-modules, ext4-modules, squashfs-modules
-Provides_amd64: efi-modules, ext3-modules, ext4-modules, squashfs-modules
-Provides_i386: efi-modules, ext3-modules, ext4-modules, squashfs-modules
-Provides_ppc64el: ext3-modules, ext4-modules, fat-modules, squashfs-modules
-Provides_s390x: ext3-modules, ext4-modules, ppp-modules, squashfs-modules
-Description: kernel image and system map
-
-Package: dasd-modules
-Depends: kernel-image, storage-core-modules
-Priority: standard
-Description: DASD storage support
-
-Package: dasd-extra-modules
-Depends: dasd-modules
-Priority: extra
-Description: DASD storage support -- extras
-
-Package: fat-modules
-Depends: kernel-image
-Priority: standard
-Description: FAT filesystem support
- This includes Windows FAT and VFAT support.
-
-Package: fb-modules
-Depends: kernel-image
-Priority: standard
-Description: Framebuffer modules
-
-Package: firewire-core-modules
-Depends: kernel-image, storage-core-modules
-Priority: standard
-Description: Firewire (IEEE-1394) Support
-
-Package: floppy-modules
-Depends: kernel-image
-Priority: standard
-Description: Floppy driver support
-
-Package: fs-core-modules
-Depends: kernel-image
-Priority: standard
-Provides: ext2-modules, jfs-modules, reiserfs-modules, xfs-modules
-Description: Base filesystem modules
- This includes jfs, reiserfs and xfs.
-
-Package: fs-secondary-modules
-Depends: kernel-image, fat-modules
-Priority: standard
-Provides: btrfs-modules, ntfs-modules, hfs-modules
-Description: Extra filesystem modules
- This includes support for Windows NTFS and MacOS HFS/HFSPlus
-
-Package: input-modules
-Depends: kernel-image, usb-modules
-Priority: standard
-Description: Support for various input methods
-
-Package: md-modules
-Depends: kernel-image
-Priority: standard
-Provides: crypto-dm-modules
-Description: Multi-device support (raid, device-mapper, lvm)
-
-Package: nic-modules
-Depends: kernel-image, nic-shared-modules, virtio-modules
-Priority: standard
-Description: Network interface support
-
-Package: nic-pcmcia-modules
-Depends: kernel-image, nic-shared-modules, nic-modules
-Priority: standard
-Description: PCMCIA network interface support
-
-Package: nic-usb-modules
-Depends: kernel-image, nic-shared-modules, usb-modules
-Priority: standard
-Description: USB network interface support
-
-Package: nic-shared-modules
-Depends: kernel-image, crypto-modules
-Priority: standard
-Description: nic shared modules
-  This package contains modules which support nic modules
-
-Package: parport-modules
-Depends: kernel-image
-Priority: standard
-Description: Parallel port support
-
-Package: pata-modules
-Depends: kernel-image, storage-core-modules
-Priority: standard
-Description: PATA support modules
-
-Package: pcmcia-modules
-Depends: kernel-image
-Priority: standard
-Description: PCMCIA Modules
-
-Package: pcmcia-storage-modules
-Depends: kernel-image, scsi-modules
-Priority: standard
-Description: PCMCIA storage support
-
-Package: plip-modules
-Depends: kernel-image, nic-shared-modules, parport-modules
-Priority: standard
-Description: PLIP (parallel port) networking support
-
-Package: ppp-modules
-Depends: kernel-image, nic-shared-modules, serial-modules
-Priority: standard
-Description: PPP (serial port) networking support
-
-Package: sata-modules
-Depends: kernel-image, storage-core-modules
-Priority: standard
-Description: SATA storage support
-
-Package: scsi-modules
-Depends: kernel-image, storage-core-modules
-Priority: standard
-Description: SCSI storage support
-
-Package: serial-modules
-Depends: kernel-image
-Priority: standard
-Description: Serial port support
-
-Package: storage-core-modules
-Depends: kernel-image
-Priority: standard
-Provides: loop-modules
-Description: Core storage support
- Includes core SCSI, LibATA, USB-Storage. Also includes related block
- devices for CD, Disk and Tape medium (and IDE Floppy).
-
-Package: usb-modules
-Depends: kernel-image, storage-core-modules
-Priority: standard
-Description: Core USB support
-
-Package: nfs-modules
-Priority: standard
-Depends: kernel-image
-Description: NFS filesystem drivers
- Includes the NFS client driver, and supporting modules.
-
-Package: block-modules
-Priority: standard
-Provides: nbd-modules
-Depends: kernel-image, storage-core-modules, parport-modules, virtio-modules
-Description: Block storage devices
- This package contains the block storage devices, including DAC960 and
- paraide.
-
-Package: message-modules
-Priority: standard
-Depends: kernel-image, storage-core-modules, scsi-modules
-Description: Fusion and i2o storage modules
- This package containes the fusion and i2o storage modules.
-
-Package: crypto-modules
-Priority: extra
-Depends: kernel-image
-Description: crypto modules
- This package contains crypto modules.
-
-Package: virtio-modules
-Priority: standard
-Depends: kernel-image
-Description: VirtIO Modules
- Includes modules for VirtIO (virtual machine, generally kvm guests)
-
-Package: socket-modules
-Depends: kernel-image
-Priority: standard
-Description: Unix socket support
-
-Package: mouse-modules
-Depends: kernel-image, input-modules, usb-modules
-Priority: extra
-Description: Mouse support
- This package contains mouse drivers for the Linux kernel.
-
-Package: vlan-modules
-Depends: kernel-image
-Priority: extra
-Description: vlan modules
- This package contains vlan (8021.Q) modules.
-
-Package: ipmi-modules
-Depends: kernel-image
-Priority: standard
-Description: ipmi modules
-
-Package: multipath-modules
-Depends: kernel-image
-Priority: extra
-Description: DM-Multipath support
-  This package contains modules for device-mapper multipath support.
-