Add scsi_transport_sas and scsi_transport_spi to scsi-core-modules udeb
as optional so that these modules do not end up in two different udebs as dependencies. Remove them from the i386, ia64, powerpc and sparc definition. svn path=/dists/sid/linux/; revision=21621
This commit is contained in:
parent
8301be0dca
commit
276e281b7f
|
@ -5,6 +5,10 @@ linux (3.14.13-2) UNRELEASED; urgency=medium
|
||||||
* [mips64,mips64el] Build udebs for 5kc-malta flavour.
|
* [mips64,mips64el] Build udebs for 5kc-malta flavour.
|
||||||
* [mipsel,mips64el/loongson-3] Disable not built modules in nic-modules,
|
* [mipsel,mips64el/loongson-3] Disable not built modules in nic-modules,
|
||||||
scsi-common-modules, scsi-extra-modules, scsi-modules (fixes FTBFS).
|
scsi-common-modules, scsi-extra-modules, scsi-modules (fixes FTBFS).
|
||||||
|
* Add scsi_transport_sas and scsi_transport_spi to scsi-core-modules udeb
|
||||||
|
as optional so that these modules do not end up in two different udebs
|
||||||
|
as dependencies. Remove them from the i386, ia64, powerpc and sparc
|
||||||
|
definition.
|
||||||
|
|
||||||
-- Aurelien Jarno <aurel32@debian.org> Mon, 21 Jul 2014 23:18:59 +0200
|
-- Aurelien Jarno <aurel32@debian.org> Mon, 21 Jul 2014 23:18:59 +0200
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
#include <scsi-core-modules>
|
#include <scsi-core-modules>
|
||||||
scsi_transport_spi
|
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
#include <scsi-core-modules>
|
#include <scsi-core-modules>
|
||||||
scsi_transport_spi
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
scsi_dh
|
scsi_dh
|
||||||
scsi_mod
|
scsi_mod
|
||||||
sd_mod
|
sd_mod
|
||||||
|
scsi_transport_sas ?
|
||||||
|
scsi_transport_spi ?
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
#include <scsi-core-modules>
|
#include <scsi-core-modules>
|
||||||
scsi_mod -
|
scsi_mod -
|
||||||
scsi_transport_spi
|
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
#include <scsi-core-modules>
|
#include <scsi-core-modules>
|
||||||
scsi_transport_spi
|
|
||||||
scsi_transport_sas
|
|
||||||
|
|
||||||
# Support for virtual disk devices as a client under Sun Logical Domains.
|
# Support for virtual disk devices as a client under Sun Logical Domains.
|
||||||
# Does not really belong here, but it's better than adding a new kernel
|
# Does not really belong here, but it's better than adding a new kernel
|
||||||
|
|
Loading…
Reference in New Issue