From 276e281b7f0c414b3f9b9f44d8acccc914397bea Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 23 Jul 2014 09:38:19 +0000 Subject: [PATCH] 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 --- debian/changelog | 4 ++++ debian/installer/i386/modules/i386/scsi-core-modules | 1 - debian/installer/ia64/modules/ia64/scsi-core-modules | 1 - debian/installer/modules/scsi-core-modules | 2 ++ debian/installer/powerpc/modules/powerpc/scsi-core-modules | 1 - debian/installer/sparc/modules/sparc/scsi-core-modules | 2 -- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf3faa7b3..1261cc866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ linux (3.14.13-2) UNRELEASED; urgency=medium * [mips64,mips64el] Build udebs for 5kc-malta flavour. * [mipsel,mips64el/loongson-3] Disable not built modules in nic-modules, 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 Mon, 21 Jul 2014 23:18:59 +0200 diff --git a/debian/installer/i386/modules/i386/scsi-core-modules b/debian/installer/i386/modules/i386/scsi-core-modules index 4684cabbe..dd65d6614 100644 --- a/debian/installer/i386/modules/i386/scsi-core-modules +++ b/debian/installer/i386/modules/i386/scsi-core-modules @@ -1,2 +1 @@ #include -scsi_transport_spi diff --git a/debian/installer/ia64/modules/ia64/scsi-core-modules b/debian/installer/ia64/modules/ia64/scsi-core-modules index 4684cabbe..dd65d6614 100644 --- a/debian/installer/ia64/modules/ia64/scsi-core-modules +++ b/debian/installer/ia64/modules/ia64/scsi-core-modules @@ -1,2 +1 @@ #include -scsi_transport_spi diff --git a/debian/installer/modules/scsi-core-modules b/debian/installer/modules/scsi-core-modules index 372fed5ed..bc3f355bc 100644 --- a/debian/installer/modules/scsi-core-modules +++ b/debian/installer/modules/scsi-core-modules @@ -1,3 +1,5 @@ scsi_dh scsi_mod sd_mod +scsi_transport_sas ? +scsi_transport_spi ? diff --git a/debian/installer/powerpc/modules/powerpc/scsi-core-modules b/debian/installer/powerpc/modules/powerpc/scsi-core-modules index 6ec85bb77..328c8aec4 100644 --- a/debian/installer/powerpc/modules/powerpc/scsi-core-modules +++ b/debian/installer/powerpc/modules/powerpc/scsi-core-modules @@ -1,3 +1,2 @@ #include scsi_mod - -scsi_transport_spi diff --git a/debian/installer/sparc/modules/sparc/scsi-core-modules b/debian/installer/sparc/modules/sparc/scsi-core-modules index d1834e5af..6026fdf46 100644 --- a/debian/installer/sparc/modules/sparc/scsi-core-modules +++ b/debian/installer/sparc/modules/sparc/scsi-core-modules @@ -1,6 +1,4 @@ #include -scsi_transport_spi -scsi_transport_sas # 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