udeb: Add scsi-nic-modules containing Chelsio and Qlogic iSCSI/FC drivers

These drivers depend on the corresponding net drivers, or at least
common modules built under drivers/net/ethernet, currently leading
to duplicate modules.

I don't want to resolve this by adding a dependency between
nic-modules and scsi-modules, as that would pull in both into
installer images that previously only needed one set of drivers.  I
also don't want to add the common modules into kernel-image as that
would bloat all installer images.  Instead, put the drivers in a new
package and we can work out which installer images should include it
later.

Build scsi-nic-modules for all architectures/flavours that build
scsi-modules using the common module list now.
This commit is contained in:
Ben Hutchings 2019-02-11 13:58:21 +00:00
parent b7a2d1a5e6
commit 07c5106918
17 changed files with 27 additions and 2 deletions

1
debian/changelog vendored
View File

@ -462,6 +462,7 @@ linux (4.19.20-1) UNRELEASED; urgency=medium
* wireless: Enable MT76x0U, MT76x2E, MT76x2U, QTNFMAC_PEARL_PCIE as modules
(Closes: #918331)
* zram: Enable ZRAM_WRITEBACK, ZRAM_MEMORY_TRACKING
* udeb: Add scsi-nic-modules containing Chelsio and Qlogic iSCSI/FC drivers
[ Marcin Juszkiewicz ]
* [arm64] enable ARM_CCI_PMU so ARM_CCI400_PMU and ARM_CCI5xx_PMU options

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -20,11 +20,12 @@ virtio_scsi -
# Exclude PCMCIA drivers, which depend on pcmcia-modules (FIXME)
drivers/scsi/pcmcia/* -
# Exclude Chelsio iSCSI drivers, which depend on the corresponding Ethernet
# drivers in nic-modules (FIXME)
# Exclude drivers for converged NICs, packaged in scsi-nic-modules
drivers/scsi/cxgbi/* -
cxgb3i -
cxgb4i -
qedf -
qedi -
# Exclude enclosure driver
ses -

View File

@ -0,0 +1,4 @@
cxgb3i
cxgb4i
qedf
qedi

View File

@ -100,6 +100,12 @@ Priority: standard
Description: SCSI drivers
This package contains SCSI drivers for the kernel.
Package: scsi-nic-modules
Depends: scsi-modules, nic-modules
Priority: optional
Description: SCSI drivers for converged NICs
This package contains SCSI drivers that depend on net drivers.
Package: loop-modules
Depends: kernel-image
Priority: standard