Bug#418707: support for Linux 2.6.20

[Bastian Blank]

On Wed, Apr 11, 2007 at 01:59:59PM +0200, Robert Millan wrote:
> Attached patch adds support for Linux 2.6.20 by merging sata-modules into
> scsi-modules.  The problem was that they now share a dependency on libata.
> I'm not sure if this can be solved more cleanly, but I was in a hurry and
> couldn't think of anything better.

In 2.6.20, sata and pata was merged into ata, not into scsi.

Bastian

-- 
Deflector shields just came on, Captain.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#418707: support for Linux 2.6.20

[Robert Millan]

Package: kernel-wedge
Version: 2.31
Severity: normal
Tags: patch

Attached patch adds support for Linux 2.6.20 by merging sata-modules into
scsi-modules.  The problem was that they now share a dependency on libata.
I'm not sure if this can be solved more cleanly, but I was in a hurry and
couldn't think of anything better.

-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-4-686
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to ca_ES.UTF-8)

Versions of packages kernel-wedge depends on:
ii  debhelper 5.0.42 helper programs for debian/rules
ii  make  3.81-2 The GNU version of the "make" util

kernel-wedge recommends no packages.

-- no debconf information
diff -Nur kernel-wedge-2.31.old/modules/sata-modules 
kernel-wedge-2.31/modules/sata-modules
--- kernel-wedge-2.31.old/modules/sata-modules  2006-07-26 00:49:22.0 
+0200
+++ kernel-wedge-2.31/modules/sata-modules  1970-01-01 01:00:00.0 
+0100
@@ -1,19 +0,0 @@
-carmel ?
-libata ?
-ata_piix ?
-sata_nv ?
-sata_promise ?
-sata_sil ?
-sata_sil24 ?
-sata_sis ?
-sata_svw ?
-sata_sx4 ?
-sata_via ?
-sata_vsc ?
-sata_qstor ?
-sata_uli ?
-ahci ?
-sx8 ?
-sata_sx4 ?
-sata_mv ?
-pdc_adma ?
diff -Nur kernel-wedge-2.31.old/modules/scsi-modules 
kernel-wedge-2.31/modules/scsi-modules
--- kernel-wedge-2.31.old/modules/scsi-modules  2006-08-15 14:33:51.0 
+0200
+++ kernel-wedge-2.31/modules/scsi-modules  2007-04-11 13:45:55.0 
+0200
@@ -32,3 +32,22 @@
 ultrastor ?
 wd7000 ?
 initio ?
+carmel ?
+libata ?
+ata_piix ?
+sata_nv ?
+sata_promise ?
+sata_sil ?
+sata_sil24 ?
+sata_sis ?
+sata_svw ?
+sata_sx4 ?
+sata_via ?
+sata_vsc ?
+sata_qstor ?
+sata_uli ?
+ahci ?
+sx8 ?
+sata_sx4 ?
+sata_mv ?
+pdc_adma ?
diff -Nur kernel-wedge-2.31.old/package-list kernel-wedge-2.31/package-list
--- kernel-wedge-2.31.old/package-list  2006-12-21 16:23:24.0 +0100
+++ kernel-wedge-2.31/package-list  2007-04-11 13:46:57.0 +0200
@@ -296,12 +296,6 @@
 Description: USB NIC drivers
  This package contains USB network adapter drivers for the Linux kernel.
 
-Package: sata-modules
-Depends: kernel-image, scsi-core-modules
-Priority: standard
-Description: SATA drivers
- This package contains SATA drivers for the Linux kernel.
-
 Package: firmware-modules
 Depends: kernel-image
 Priority: standard