udeb: Combine scsi-{common,extra}-modules with scsi-modules

This commit is contained in:
Ben Hutchings 2016-02-15 01:31:37 +00:00
parent 02bda7119f
commit b8c3eeca7f
41 changed files with 104 additions and 141 deletions

1
debian/changelog vendored
View File

@ -14,6 +14,7 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
* bpf: fix branch offset adjustment on backjumps after patching ctx expansion * bpf: fix branch offset adjustment on backjumps after patching ctx expansion
(CVE-2016-2383) (CVE-2016-2383)
* ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-2384) * ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-2384)
* udeb: Combine scsi-{common,extra}-modules with scsi-modules
[ Roger Shimizu ] [ Roger Shimizu ]
* Enable TTY_PRINTK as module (Closes: #814540). * Enable TTY_PRINTK as module (Closes: #814540).

View File

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

View File

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

View File

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

View File

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

View File

@ -8,7 +8,7 @@ Package: fat-modules
Priority: standard Priority: standard
Package: scsi-modules Package: scsi-modules
Depends: kernel-image, scsi-core-modules, scsi-common-modules, cdrom-core-modules, core-modules, ata-modules Depends: kernel-image, scsi-core-modules, cdrom-core-modules, core-modules, ata-modules
Package: kernel-image Package: kernel-image
Provides: zlib-modules Provides: zlib-modules

View File

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

View File

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

View File

@ -1,3 +1,8 @@
aic79xx
aic7xxx
BusLogic ?
sym53c8xx
sym53c8xx_2 ?
53c700 53c700
ch ch
lasi700 lasi700

View File

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

View File

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

View File

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

View File

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

View File

@ -1,2 +0,0 @@
#include <scsi-common-modules>
sym53c8xx -

View File

@ -1,4 +0,0 @@
#include <scsi-extra-modules>
cciss -
DAC960 -
ips -

View File

@ -1,2 +1,6 @@
#include <scsi-modules> #include <scsi-modules>
DAC960 -
cciss -
dmx3191d - dmx3191d -
ips -
sym53c8xx -

View File

@ -1,2 +0,0 @@
#include <scsi-common-modules>
sym53c8xx -

View File

@ -1,4 +0,0 @@
#include <scsi-extra-modules>
cciss -
DAC960 -
ips -

View File

@ -1,2 +1,6 @@
#include <scsi-modules> #include <scsi-modules>
DAC960 -
cciss -
dmx3191d - dmx3191d -
ips -
sym53c8xx -

View File

@ -1,2 +0,0 @@
#include <scsi-common-modules>
sym53c8xx -

View File

@ -1,4 +0,0 @@
#include <scsi-extra-modules>
cciss -
DAC960 -
ips -

View File

@ -1,2 +1,6 @@
#include <scsi-modules> #include <scsi-modules>
DAC960 -
cciss -
dmx3191d - dmx3191d -
ips -
sym53c8xx -

View File

@ -1,2 +0,0 @@
#include <scsi-common-modules>
sym53c8xx -

View File

@ -1,4 +0,0 @@
#include <scsi-extra-modules>
cciss -
DAC960 -
ips -

View File

@ -1,2 +1,6 @@
#include <scsi-modules> #include <scsi-modules>
DAC960 -
cciss -
dmx3191d - dmx3191d -
ips -
sym53c8xx -

View File

@ -1,6 +0,0 @@
# Some historically common SCSI drivers
aic79xx
aic7xxx
BusLogic ?
sym53c8xx
sym53c8xx_2 ?

View File

@ -1,47 +0,0 @@
# tape
osst
st
# host adapters
3w-9xxx ?
3w-sas ?
3w-xxxx
aacraid
aha152x ?
arcmsr ?
bnx2fc ?
cciss
cpqarray ?
csiostor ?
DAC960
dtc ?
eata ?
fdomain ?
fnic ?
gdth ?
hpsa ?
hptiop ?
ibmmca ?
ips
isci ?
lpfc ?
megaraid ?
megaraid_mbox ?
megaraid_mm ?
megaraid_sas ?
mpt3sas ?
mptbase
mptfc ?
mptsas ?
mptscsih
mptspi ?
mvsas
pm80xx ?
pmcraid ?
qla2xxx ?
qla4xxx ?
sym53c416 ?
ufshcd ?
ufshcd-pci ?
vmw_pvscsi ?
wd719x ?

View File

@ -1,29 +1,83 @@
# host adapters
3w-9xxx ?
3w-sas ?
3w-xxxx
BusLogic ?
DAC960
NCR53c406a ? NCR53c406a ?
aacraid
advansys ? advansys ?
aha152x ?
aha1542 ? aha1542 ?
aha1740 ? aha1740 ?
aic79xx
aic7xxx
aic94xx ?
arcmsr ?
atp870u ? atp870u ?
bnx2fc ?
cciss
cpqarray ?
csiostor ?
dc395x ?
dmx3191d dmx3191d
dtc ?
eata ?
esas2r ? esas2r ?
fd_mcs ? fd_mcs ?
fdomain ?
fnic ?
g_NCR5380 ? g_NCR5380 ?
gdth ?
hpsa ?
hptiop ?
ibmmca ?
in2000 ? in2000 ?
pas16 ?
qla1280 ?
qlogicfas ?
sg
sim710 ?
snic ?
t128 ?
u14-34f ?
ultrastor ?
wd7000 ?
initio ? initio ?
ipr ? ipr ?
qlogicfas408 ? ips
dc395x ? isci ?
aic94xx ?
stex ?
xen-blkfront ?
iscsi_tcp ?
iscsi_ibft ? iscsi_ibft ?
iscsi_tcp ?
lpfc ?
megaraid ?
megaraid_mbox ?
megaraid_mm ?
megaraid_sas ?
mpt3sas ?
mptbase
mptfc ?
mptsas ?
mptscsih
mptspi ?
mvsas
pas16 ?
pm80xx ?
pmcraid ?
qla1280 ?
qla2xxx ?
qla4xxx ?
qlogicfas ?
qlogicfas408 ?
sim710 ?
snic ?
stex ?
sym53c416 ?
sym53c8xx
sym53c8xx_2 ?
t128 ?
u14-34f ?
ufshcd ?
ufshcd-pci ?
ultrastor ?
vmw_pvscsi ?
wd7000 ?
wd719x ?
xen-blkfront ?
# generic
sg
# tape
osst
st

View File

@ -79,20 +79,6 @@ Priority: standard
Description: SCSI drivers Description: SCSI drivers
This package contains SCSI drivers for the kernel. This package contains SCSI drivers for the kernel.
Package: scsi-common-modules
Depends: kernel-image, scsi-core-modules, cdrom-core-modules
Priority: standard
Description: Very common SCSI drivers
This package contains very common SCSI drivers for the kernel.
Package: scsi-extra-modules
Depends: scsi-modules, scsi-core-modules, core-modules
Priority: standard
Description: Uncommon SCSI drivers
This package contains uncommon SCSI drivers for the kernel.
This includes SCSI RAID drivers, and some of the less common SCSI
controllers.
Package: loop-modules Package: loop-modules
Depends: kernel-image Depends: kernel-image
Priority: standard Priority: standard

View File

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

View File

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

View File

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

View File

@ -1,3 +0,0 @@
#include <scsi-extra-modules>
ps3disk ?

View File

@ -1,4 +1,5 @@
#include <scsi-modules> #include <scsi-modules>
ibmvscsi ibmvscsi
ps3disk ?
ps3rom ps3rom

View File

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

View File

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

View File

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

View File

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

View File

@ -1,8 +0,0 @@
sun_esp
aic79xx
aic7xxx
qlogicpti ?
sym53c8xx
mptsas
mptspi
mpt3sas

View File

@ -1,6 +1,8 @@
3w-9xxx 3w-9xxx
3w-xxxx 3w-xxxx
aacraid aacraid
aic79xx
aic7xxx
aic94xx aic94xx
arcmsr arcmsr
atp870u ? atp870u ?
@ -8,12 +10,18 @@ dc395x
dmx3191d dmx3191d
hptiop hptiop
initio initio
ipr
lpfc lpfc
megaraid megaraid
megaraid_sas megaraid_sas
mpt3sas
mptsas
mptspi
osst osst
ipr
stex
qla1280 ? qla1280 ?
qla2xxx ? qla2xxx ?
qla4xxx ? qla4xxx ?
qlogicpti ?
stex
sun_esp
sym53c8xx