udeb: Move drivers from {hyperv,virtio}-modules to {fb,input,nic,scsi}-modules

Now that the shared dependencies of these drivers are in kernel-image,
we can safely move them into the packages for each driver class.
This commit is contained in:
Ben Hutchings 2019-02-12 21:10:57 +00:00
parent cb01662a3e
commit f98f9b5dcf
27 changed files with 10 additions and 54 deletions

2
debian/changelog vendored
View File

@ -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 * udeb: Add fb-modules and include drm and drm_kms_helper on most
architecures architecures
* udeb: Move basic PV modules from {hyperv,virtio}-modules to kernel-image * 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 <ben@decadent.org.uk> Tue, 12 Feb 2019 12:49:10 +0000 -- Ben Hutchings <ben@decadent.org.uk> Tue, 12 Feb 2019 12:49:10 +0000

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,3 +3,4 @@
drm drm
drm_kms_helper drm_kms_helper
virtio-gpu ?

View File

@ -1 +0,0 @@
#include "../hppa/virtio-modules"

View File

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

View File

@ -1,5 +0,0 @@
# All Hyper-V paravirtual drivers
hid-hyperv
hv_netvsc
hv_storvsc
hyperv-keyboard

View File

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

View File

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

View File

@ -1,9 +1,6 @@
# Include HID drivers by default # Include HID drivers by default
drivers/hid/** drivers/hid/**
# Exclude hid-hyperv, packaged in hyperv-modules
hid-hyperv -
# Exclude drivers for anything but keyboard and mouse/trackball/touchpad # Exclude drivers for anything but keyboard and mouse/trackball/touchpad
drivers/hid/hid-*ff - drivers/hid/hid-*ff -
hid-dr - hid-dr -
@ -37,3 +34,6 @@ synaptics_usb ?
wistron_btns ? wistron_btns ?
gpio_keys ? gpio_keys ?
soc_button_array ? soc_button_array ?
hyperv-keyboard ?
virtio_console ?
virtio_input ?

View File

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

View File

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

View File

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

View File

@ -3,7 +3,9 @@ drivers/net/dsa/** ?
drivers/net/ethernet/** drivers/net/ethernet/**
drivers/net/phy/* drivers/net/phy/*
# Include paravirtual network drivers with minimal dependencies # Include paravirtual network drivers
hv_netvsc ?
virtio_net ?
vmxnet3 ? vmxnet3 ?
xen-netfront ? xen-netfront ?

View File

@ -1 +0,0 @@
#include "../powerpc/virtio-modules"

View File

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

View File

@ -1 +0,0 @@
#include "../ppc64/virtio-modules"

View File

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

View File

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

View File

@ -11,12 +11,6 @@ iscsi_ibft ?
# Include Xen block driver even though it's not SCSI # Include Xen block driver even though it's not SCSI
xen-blkfront ? 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) # Exclude PCMCIA drivers, which depend on pcmcia-modules (FIXME)
drivers/scsi/pcmcia/* - drivers/scsi/pcmcia/* -
@ -51,3 +45,4 @@ scsi_debug -
# XXX not actually SCSI # XXX not actually SCSI
nvme ? nvme ?
virtio_blk ?

View File

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

View File

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

View File

@ -1,8 +0,0 @@
virtio_net
virtio_blk
virtio_scsi
virtio_input
virtio_console
# Some architectures do not build graphics
virtio-gpu ?

View File

@ -364,12 +364,6 @@ Priority: optional
Description: RTC modules Description: RTC modules
This package contains 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 Package: uinput-modules
Depends: kernel-image Depends: kernel-image
Priority: optional Priority: optional
@ -400,12 +394,6 @@ Priority: optional
Description: LED modules Description: LED modules
This package contains 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 Package: udf-modules
Depends: kernel-image, crc-modules Depends: kernel-image, crc-modules
Priority: optional Priority: optional