r2300 - in trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27: config/mips config/mipsel debian
Thiemo Seufer
ths-guest@costa.debian.org
Sat, 15 Jan 2005 01:28:59 +0100
Author: ths-guest
Date: 2005-01-15 01:28:58 +0100 (Sat, 15 Jan 2005)
New Revision: 2300
Modified:
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/xxs1500
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
Log:
Update for build from 2.4.27-8.
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mips/sb1-swarm-bn 2005-01-15 00:28:58 UTC (rev 2300)
@@ -1320,12 +1320,12 @@
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_STORAGE_JUMPSHOT is not set
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/r5k-cobalt 2005-01-15 00:28:58 UTC (rev 2300)
@@ -457,9 +457,88 @@
#
# SCSI support
#
-# CONFIG_SCSI is not set
+CONFIG_SCSI=m
#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_SD_EXTRA_DEVS=40
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_DEBUG_QUEUES is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_AM53C974 is not set
+# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_SCSI_MEGARAID2 is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_VIA is not set
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_DMA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_NCR53C7xx is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_NCR53C8XX is not set
+# CONFIG_SCSI_SYM53C8XX is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PCI2000 is not set
+# CONFIG_SCSI_PCI2220I is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_SIM710 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
# Fusion MPT device support
#
# CONFIG_FUSION is not set
@@ -954,19 +1033,15 @@
CONFIG_USB_EMI26=m
CONFIG_USB_BLUETOOTH=m
CONFIG_USB_MIDI=m
-
-#
-# SCSI support is needed for USB Storage
-#
-# CONFIG_USB_STORAGE is not set
+CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_STORAGE_JUMPSHOT is not set
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/sb1-swarm-bn 2005-01-15 00:28:58 UTC (rev 2300)
@@ -1319,12 +1319,12 @@
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_DPCM is not set
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_STORAGE_JUMPSHOT is not set
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/xxs1500
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/xxs1500 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/config/mipsel/xxs1500 2005-01-15 00:28:58 UTC (rev 2300)
@@ -1182,14 +1182,14 @@
# CONFIG_USB_BLUETOOTH is not set
# CONFIG_USB_MIDI is not set
CONFIG_USB_STORAGE=m
-CONFIG_USB_STORAGE_DEBUG=y
+# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
CONFIG_USB_STORAGE_FREECOM=y
CONFIG_USB_STORAGE_ISD200=y
-# CONFIG_USB_STORAGE_DPCM is not set
+CONFIG_USB_STORAGE_DPCM=y
# CONFIG_USB_STORAGE_HP8200e is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/changelog 2005-01-15 00:28:58 UTC (rev 2300)
@@ -1,3 +1,13 @@
+kernel-patch-2.4.27-mips (2.4.27-8.040815-1) UNRELEASED; urgency=high
+
+ * Update to debian kernel source 2.4.27-8 for security fixes.
+ See kernel source changelog for details.
+ * Enable CONFIG_USB_STORAGE for cobalt, and bring the storage modules
+ of other USB-using subarches in line with it (Closes: #290482).
+ * Fix detection of make failures.
+
+ -- Thiemo Seufer <ths@debian.org> Fri, 14 Jan 2005 19:46:13 +0100
+
kernel-patch-2.4.27-mips (2.4.27-7.040815-1) unstable; urgency=low
* Update to debian kernel source 2.4.27-7, mainly for security fixes.
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/control 2005-01-15 00:28:58 UTC (rev 2300)
@@ -2,8 +2,8 @@
Section: devel
Priority: optional
Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
-Uploaders: Guido Guenther <agx@debian.org>, Karsten Merker <merker@debian.org>, Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-Build-Depends: kernel-source-2.4.27 (>=2.4.27-7), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
+Uploaders: Guido Guenther <agx@debian.org>, Karsten Merker <merker@debian.org>, Thiemo Seufer <ths@debian.org>
+Build-Depends: kernel-source-2.4.27 (>=2.4.27-8), kernel-package, debhelper (>=4.1.0), modutils, console-tools, dpatch, bzip2
Standards-Version: 3.6.1
Package: kernel-headers-2.4.27
Modified: trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules 2005-01-14 11:36:52 UTC (rev 2299)
+++ trunk/kernel-2.4/mips/kernel-patch-2.4.27-mips-2.4.27/debian/rules 2005-01-15 00:28:58 UTC (rev 2300)
@@ -111,15 +111,14 @@
# Messes up version detection with kernel-package - but that's good
$(foreach sub,$(subarches), \
- set -e; \
- echo "Building subarch $(sub)"; \
- ( cd $(kdir) && make-kpkg clean && make-kpkg debian ); \
- cp debian/changelog debian/control $(kdir)/debian/; \
- echo official > $(kdir)/debian/official; \
- cp config/$(arch)/$(sub) $(kdir)/.config; \
+ echo "Building subarch $(sub)" && \
+ ( cd $(kdir) && make-kpkg clean && make-kpkg debian ) && \
+ cp debian/changelog debian/control $(kdir)/debian/ && \
+ echo official > $(kdir)/debian/official && \
+ cp config/$(arch)/$(sub) $(kdir)/.config && \
( cd $(kdir) && CONCURRENCY_LEVEL=$(NUM_CPUS) make-kpkg \
- --subarch $(sub) --append-to-version=-$(sub) kernel_image ); \
- cp build-tmp/kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb ..;)
+ --subarch $(sub) --append-to-version=-$(sub) kernel_image ) && \
+ cp build-tmp/kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb .. && ) :
endif
binary-arch: binary-images binary-headers
@@ -139,7 +138,7 @@
ifneq ($(subarches),)
# finally add the kernel images and headers
$(foreach sub,$(subarches), \
- dpkg-distaddfile kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb base optional;)
+ dpkg-distaddfile kernel-image-$(basever)-$(sub)_$(debver)_$(arch).deb base optional && ) :
dpkg-distaddfile kernel-headers-$(basever)_$(debver)_$(arch).deb devel optional
endif