[kernel] r21621 - in dists/sid/linux/debian: . installer/i386/modules/i386 installer/ia64/modules/ia64 installer/modules installer/powerpc/modules/powerpc installer/sparc/modules/sparc

[Aurelien Jarno]

Author: aurel32
Date: Wed Jul 23 09:38:19 2014
New Revision: 21621

Log:
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.

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/installer/i386/modules/i386/scsi-core-modules
   dists/sid/linux/debian/installer/ia64/modules/ia64/scsi-core-modules
   dists/sid/linux/debian/installer/modules/scsi-core-modules
   dists/sid/linux/debian/installer/powerpc/modules/powerpc/scsi-core-modules
   dists/sid/linux/debian/installer/sparc/modules/sparc/scsi-core-modules

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Wed Jul 23 02:41:29 2014	(r21620)
+++ dists/sid/linux/debian/changelog	Wed Jul 23 09:38:19 2014	(r21621)
@@ -5,6 +5,10 @@
   * [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 <aurel32 at debian.org>  Mon, 21 Jul 2014 23:18:59 +0200 
 

Modified: dists/sid/linux/debian/installer/i386/modules/i386/scsi-core-modules
==============================================================================
--- dists/sid/linux/debian/installer/i386/modules/i386/scsi-core-modules	Wed Jul 23 02:41:29 2014	(r21620)
+++ dists/sid/linux/debian/installer/i386/modules/i386/scsi-core-modules	Wed Jul 23 09:38:19 2014	(r21621)
@@ -1,2 +1 @@
 #include <scsi-core-modules>
-scsi_transport_spi

Modified: dists/sid/linux/debian/installer/ia64/modules/ia64/scsi-core-modules
==============================================================================
--- dists/sid/linux/debian/installer/ia64/modules/ia64/scsi-core-modules	Wed Jul 23 02:41:29 2014	(r21620)
+++ dists/sid/linux/debian/installer/ia64/modules/ia64/scsi-core-modules	Wed Jul 23 09:38:19 2014	(r21621)
@@ -1,2 +1 @@
 #include <scsi-core-modules>
-scsi_transport_spi

Modified: dists/sid/linux/debian/installer/modules/scsi-core-modules
==============================================================================
--- dists/sid/linux/debian/installer/modules/scsi-core-modules	Wed Jul 23 02:41:29 2014	(r21620)
+++ dists/sid/linux/debian/installer/modules/scsi-core-modules	Wed Jul 23 09:38:19 2014	(r21621)
@@ -1,3 +1,5 @@
 scsi_dh
 scsi_mod
 sd_mod
+scsi_transport_sas ?
+scsi_transport_spi ?

Modified: dists/sid/linux/debian/installer/powerpc/modules/powerpc/scsi-core-modules
==============================================================================
--- dists/sid/linux/debian/installer/powerpc/modules/powerpc/scsi-core-modules	Wed Jul 23 02:41:29 2014	(r21620)
+++ dists/sid/linux/debian/installer/powerpc/modules/powerpc/scsi-core-modules	Wed Jul 23 09:38:19 2014	(r21621)
@@ -1,3 +1,2 @@
 #include <scsi-core-modules>
 scsi_mod -
-scsi_transport_spi

Modified: dists/sid/linux/debian/installer/sparc/modules/sparc/scsi-core-modules
==============================================================================
--- dists/sid/linux/debian/installer/sparc/modules/sparc/scsi-core-modules	Wed Jul 23 02:41:29 2014	(r21620)
+++ dists/sid/linux/debian/installer/sparc/modules/sparc/scsi-core-modules	Wed Jul 23 09:38:19 2014	(r21621)
@@ -1,6 +1,4 @@
 #include <scsi-core-modules>
-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