diff --git a/debian/changelog b/debian/changelog index d6483c139..adfcb446d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ linux (4.19.20-2) UNRELEASED; urgency=medium * udeb: Add fb-modules and include drm and drm_kms_helper on most architecures * udeb: Move basic PV modules from {hyperv,virtio}-modules to kernel-image + * udeb: Move drivers from {hyperv,virtio}-modules to + {fb,input,nic,scsi}-modules -- Ben Hutchings Tue, 12 Feb 2019 12:49:10 +0000 diff --git a/debian/installer/modules/alpha-generic/virtio-modules b/debian/installer/modules/alpha-generic/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/alpha-generic/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/amd64/hyperv-modules b/debian/installer/modules/amd64/hyperv-modules deleted file mode 100644 index 69fdd5d22..000000000 --- a/debian/installer/modules/amd64/hyperv-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/amd64/virtio-modules b/debian/installer/modules/amd64/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/amd64/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/arm64/virtio-modules b/debian/installer/modules/arm64/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/arm64/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/armhf-armmp/virtio-modules b/debian/installer/modules/armhf-armmp/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/armhf-armmp/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/fb-modules b/debian/installer/modules/fb-modules index cfc8d5a9c..f17b6e6ae 100644 --- a/debian/installer/modules/fb-modules +++ b/debian/installer/modules/fb-modules @@ -3,3 +3,4 @@ drm drm_kms_helper +virtio-gpu ? diff --git a/debian/installer/modules/hppa-parisc64-smp/virtio-modules b/debian/installer/modules/hppa-parisc64-smp/virtio-modules deleted file mode 100644 index 2f4e67a8a..000000000 --- a/debian/installer/modules/hppa-parisc64-smp/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../hppa/virtio-modules" diff --git a/debian/installer/modules/hppa/virtio-modules b/debian/installer/modules/hppa/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/hppa/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/hyperv-modules b/debian/installer/modules/hyperv-modules deleted file mode 100644 index 9499774c2..000000000 --- a/debian/installer/modules/hyperv-modules +++ /dev/null @@ -1,5 +0,0 @@ -# All Hyper-V paravirtual drivers -hid-hyperv -hv_netvsc -hv_storvsc -hyperv-keyboard diff --git a/debian/installer/modules/i386/hyperv-modules b/debian/installer/modules/i386/hyperv-modules deleted file mode 100644 index 69fdd5d22..000000000 --- a/debian/installer/modules/i386/hyperv-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/i386/virtio-modules b/debian/installer/modules/i386/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/i386/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules index 3245d16ea..d6a995420 100644 --- a/debian/installer/modules/input-modules +++ b/debian/installer/modules/input-modules @@ -1,9 +1,6 @@ # Include HID drivers by default drivers/hid/** -# Exclude hid-hyperv, packaged in hyperv-modules -hid-hyperv - - # Exclude drivers for anything but keyboard and mouse/trackball/touchpad drivers/hid/hid-*ff - hid-dr - @@ -37,3 +34,6 @@ synaptics_usb ? wistron_btns ? gpio_keys ? soc_button_array ? +hyperv-keyboard ? +virtio_console ? +virtio_input ? diff --git a/debian/installer/modules/mips-4kc-malta/virtio-modules b/debian/installer/modules/mips-4kc-malta/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/mips-4kc-malta/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/mips-octeon/virtio-modules b/debian/installer/modules/mips-octeon/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/mips-octeon/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/mipsel-loongson-3/virtio-modules b/debian/installer/modules/mipsel-loongson-3/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/mipsel-loongson-3/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules index b3e9e840a..0ee525365 100644 --- a/debian/installer/modules/nic-modules +++ b/debian/installer/modules/nic-modules @@ -3,7 +3,9 @@ drivers/net/dsa/** ? drivers/net/ethernet/** drivers/net/phy/* -# Include paravirtual network drivers with minimal dependencies +# Include paravirtual network drivers +hv_netvsc ? +virtio_net ? vmxnet3 ? xen-netfront ? diff --git a/debian/installer/modules/powerpc-powerpc64/virtio-modules b/debian/installer/modules/powerpc-powerpc64/virtio-modules deleted file mode 100644 index 0eeae58e9..000000000 --- a/debian/installer/modules/powerpc-powerpc64/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../powerpc/virtio-modules" diff --git a/debian/installer/modules/powerpc/virtio-modules b/debian/installer/modules/powerpc/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/powerpc/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/ppc64el/virtio-modules b/debian/installer/modules/ppc64el/virtio-modules deleted file mode 100644 index 9a32c3dd7..000000000 --- a/debian/installer/modules/ppc64el/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../ppc64/virtio-modules" diff --git a/debian/installer/modules/riscv64/virtio-modules b/debian/installer/modules/riscv64/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/riscv64/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/s390x/virtio-modules b/debian/installer/modules/s390x/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/s390x/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules index 2c9ac6d44..019f9a657 100644 --- a/debian/installer/modules/scsi-modules +++ b/debian/installer/modules/scsi-modules @@ -11,12 +11,6 @@ iscsi_ibft ? # Include Xen block driver even though it's not SCSI xen-blkfront ? -# Exclude hv_storvsc, packaged in hyperv-modules -hv_storvsc - - -# Exclude virtio_scsi, packaged in virtio-modules -virtio_scsi - - # Exclude PCMCIA drivers, which depend on pcmcia-modules (FIXME) drivers/scsi/pcmcia/* - @@ -51,3 +45,4 @@ scsi_debug - # XXX not actually SCSI nvme ? +virtio_blk ? diff --git a/debian/installer/modules/sh4-sh7751r/virtio-modules b/debian/installer/modules/sh4-sh7751r/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/sh4-sh7751r/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/sparc64/virtio-modules b/debian/installer/modules/sparc64/virtio-modules deleted file mode 100644 index 61da39659..000000000 --- a/debian/installer/modules/sparc64/virtio-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/modules/virtio-modules b/debian/installer/modules/virtio-modules deleted file mode 100644 index a92b29624..000000000 --- a/debian/installer/modules/virtio-modules +++ /dev/null @@ -1,8 +0,0 @@ -virtio_net -virtio_blk -virtio_scsi -virtio_input -virtio_console - -# Some architectures do not build graphics -virtio-gpu ? diff --git a/debian/installer/package-list b/debian/installer/package-list index f1c6fbae0..fdec23496 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -364,12 +364,6 @@ Priority: optional Description: RTC modules This package contains RTC modules. -Package: virtio-modules -Depends: kernel-image, scsi-core-modules, fb-modules -Priority: optional -Description: virtio modules - This package contains virtio modules. - Package: uinput-modules Depends: kernel-image Priority: optional @@ -400,12 +394,6 @@ Priority: optional Description: LED modules This package contains LED modules. -Package: hyperv-modules -Depends: kernel-image, input-modules, scsi-core-modules, nic-shared-modules -Priority: optional -Description: Hyper-V modules - This package contains Hyper-V paravirtualised drivers for the kernel. - Package: udf-modules Depends: kernel-image, crc-modules Priority: optional