r2868 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-03-31 07:41:00 +0000 (Thu, 31 Mar 2005)
New Revision: 2868

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/qla2xxx-removed.patch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2
Log:
The qla2xxx was pruned from the source, however some stray Kconfig and Makefile entries were left which caused build problems.

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-30 09:42:49 UTC (rev 2867)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-31 07:41:00 UTC (rev 2868)
@@ -34,8 +34,13 @@
     No CAN number available at this time.
     (Simon Horman)
 
- -- Simon Horman <horms@debian.org>  Wed, 30 Mar 2005 17:55:02 +0900
+  * qla2xxx-removed.patch:
+    The qla2xxx was pruned from the source, however some stray Kconfig
+    and Makefile entries were left which caused build problems.
+    (closes: #301936, #301603) Simon Horman
 
+ -- Simon Horman <horms@debian.org>  Thu, 31 Mar 2005 16:24:28 +0900
+
 kernel-source-2.6.11 (2.6.11-1) unstable; urgency=low
 
   * Initial 2.6.11 kernel-source creation (Sven Luther)

Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/qla2xxx-removed.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/qla2xxx-removed.patch	2005-03-30 09:42:49 UTC (rev 2867)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/qla2xxx-removed.patch	2005-03-31 07:41:00 UTC (rev 2868)
@@ -0,0 +1,26 @@
+# origin: Debian (horms)
+# cset: n/a
+# inclusion: not suitable for upstream
+# revision date: 2005-03-31
+# description: tidy up qla2xxx non-free prune
+--- a/drivers/scsi/Makefile	2005-03-31 16:23:04.000000000 +0900
++++ b/drivers/scsi/Makefile	2005-03-31 16:23:29.000000000 +0900
+@@ -79,7 +79,6 @@
+ obj-$(CONFIG_SCSI_QLOGIC_ISP)	+= qlogicisp.o 
+ obj-$(CONFIG_SCSI_QLOGIC_FC)	+= qlogicfc.o 
+ obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
+-obj-$(CONFIG_SCSI_QLA2XXX)	+= qla2xxx/
+ obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
+ obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o
+ obj-$(CONFIG_SCSI_FD_8xx)	+= seagate.o
+--- a/drivers/scsi/Kconfig	2005-03-31 16:32:50.000000000 +0900
++++ b/drivers/scsi/Kconfig	2005-03-31 16:32:53.000000000 +0900
+@@ -1340,8 +1340,6 @@
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called qlogicpti.
+ 
+-source "drivers/scsi/qla2xxx/Kconfig"
+-
+ config SCSI_SEAGATE
+ 	tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support"
+ 	depends on X86 && ISA && SCSI && BROKEN

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2	2005-03-30 09:42:49 UTC (rev 2867)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2	2005-03-31 07:41:00 UTC (rev 2868)
@@ -8,3 +8,6 @@
 + fs-isofs-range-check-2.patch
 + fs-isofs-range-check-3.patch
 + fs-binfmt_elf-dos.patch
+X drivers/scsi/qla2xxx/Makefile
+X drivers/scsi/qla2xxx/Kconfig
++ qla2xxx-removed.patch