diff --git a/debian/changelog b/debian/changelog index dfc8e4053..e233af48f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/installer/modules/alpha-generic/scsi-nic-modules b/debian/installer/modules/alpha-generic/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/alpha-generic/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/amd64/scsi-nic-modules b/debian/installer/modules/amd64/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/amd64/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/arm64/scsi-nic-modules b/debian/installer/modules/arm64/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/arm64/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/armhf-armmp/scsi-nic-modules b/debian/installer/modules/armhf-armmp/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/armhf-armmp/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/i386/scsi-nic-modules b/debian/installer/modules/i386/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/i386/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/ia64/scsi-nic-modules b/debian/installer/modules/ia64/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/ia64/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/mips-4kc-malta/scsi-nic-modules b/debian/installer/modules/mips-4kc-malta/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/mips-4kc-malta/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/mips-octeon/scsi-nic-modules b/debian/installer/modules/mips-octeon/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/mips-octeon/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/mipsel-loongson-3/scsi-nic-modules b/debian/installer/modules/mipsel-loongson-3/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/mipsel-loongson-3/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/powerpc-powerpc64/scsi-nic-modules b/debian/installer/modules/powerpc-powerpc64/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/powerpc-powerpc64/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/powerpc/scsi-nic-modules b/debian/installer/modules/powerpc/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/powerpc/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/ppc64el/scsi-nic-modules b/debian/installer/modules/ppc64el/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/ppc64el/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/riscv64/scsi-nic-modules b/debian/installer/modules/riscv64/scsi-nic-modules new file mode 100644 index 000000000..089dd5dc6 --- /dev/null +++ b/debian/installer/modules/riscv64/scsi-nic-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules index 24f409957..2c9ac6d44 100644 --- a/debian/installer/modules/scsi-modules +++ b/debian/installer/modules/scsi-modules @@ -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 - diff --git a/debian/installer/modules/scsi-nic-modules b/debian/installer/modules/scsi-nic-modules new file mode 100644 index 000000000..b2b8f5e5d --- /dev/null +++ b/debian/installer/modules/scsi-nic-modules @@ -0,0 +1,4 @@ +cxgb3i +cxgb4i +qedf +qedi diff --git a/debian/installer/package-list b/debian/installer/package-list index 9a85a3688..47a1562e0 100644 --- a/debian/installer/package-list +++ b/debian/installer/package-list @@ -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