r1266 - in trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26: config debian

Dann Frazier dannf@haydn.debian.org
Sat, 21 Aug 2004 16:23:13 -0600


Author: dannf
Date: 2004-08-21 16:22:54 -0600 (Sat, 21 Aug 2004)
New Revision: 1266

Modified:
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/default
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium-smp
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley-smp
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/changelog
   trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/control
Log:
Update configs to build against k-s-2.4.26-6 & prepare for upload.

This was already uploaded & rejected because the metapackage versions
are < their 2.4.27 counterparts, which are already in sid.  However,
this version may go into t-p-u where no such conflict exists, so
I'll spin another version for sid w/o these meta packages.



Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/default
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/default	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/default	2004-08-21 22:22:54 UTC (rev 1266)
@@ -446,6 +446,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Fusion MPT device support
@@ -604,7 +605,10 @@
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_SVW=m
+CONFIG_SCSI_ATA_PIIX=m
+CONFIG_SCSI_SATA_NV=m
 CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
 CONFIG_SCSI_SATA_VIA=m
@@ -1652,7 +1656,7 @@
 #
 # Library routines
 #
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_FW_LOADER=m

Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium	2004-08-21 22:22:54 UTC (rev 1266)
@@ -445,6 +445,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Fusion MPT device support
@@ -603,7 +604,10 @@
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_SVW=m
+CONFIG_SCSI_ATA_PIIX=m
+CONFIG_SCSI_SATA_NV=m
 CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
 CONFIG_SCSI_SATA_VIA=m
@@ -1651,7 +1655,7 @@
 #
 # Library routines
 #
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_FW_LOADER=m

Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium-smp
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium-smp	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/itanium-smp	2004-08-21 22:22:54 UTC (rev 1266)
@@ -446,6 +446,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Fusion MPT device support
@@ -604,7 +605,10 @@
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_SVW=m
+CONFIG_SCSI_ATA_PIIX=m
+CONFIG_SCSI_SATA_NV=m
 CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
 CONFIG_SCSI_SATA_VIA=m
@@ -1652,7 +1656,7 @@
 #
 # Library routines
 #
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_FW_LOADER=m

Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley	2004-08-21 22:22:54 UTC (rev 1266)
@@ -445,6 +445,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Fusion MPT device support
@@ -603,7 +604,10 @@
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_SVW=m
+CONFIG_SCSI_ATA_PIIX=m
+CONFIG_SCSI_SATA_NV=m
 CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
 CONFIG_SCSI_SATA_VIA=m
@@ -1651,7 +1655,7 @@
 #
 # Library routines
 #
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_FW_LOADER=m

Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley-smp
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley-smp	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/config/mckinley-smp	2004-08-21 22:22:54 UTC (rev 1266)
@@ -446,6 +446,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Fusion MPT device support
@@ -604,7 +605,10 @@
 CONFIG_SCSI_MEGARAID2=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_SVW=m
+CONFIG_SCSI_ATA_PIIX=m
+CONFIG_SCSI_SATA_NV=m
 CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_SX4=m
 CONFIG_SCSI_SATA_SIL=m
 CONFIG_SCSI_SATA_SIS=m
 CONFIG_SCSI_SATA_VIA=m
@@ -1652,7 +1656,7 @@
 #
 # Library routines
 #
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_FW_LOADER=m

Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/changelog	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/changelog	2004-08-21 22:22:54 UTC (rev 1266)
@@ -1,3 +1,12 @@
+kernel-image-2.4.26-ia64 (2.4.26-6) unstable; urgency=high
+
+  * dann frazier
+    - Build against kernel-tree-2.4.26-6
+  * Urgency set to high because kernel-source-2.4.26 (2.4.26-6) fixes
+    some security problems.
+
+ -- dann frazier <dannf@debian.org>  Thu, 19 Aug 2004 21:58:15 -0600
+
 kernel-image-2.4.26-ia64 (2.4.26-5) unstable; urgency=high
 
   * dann frazier

Modified: trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/control
===================================================================
--- trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/control	2004-08-21 22:14:39 UTC (rev 1265)
+++ trunk/kernel-2.4/ia64/kernel-image-2.4.26-ia64-2.4.26/debian/control	2004-08-21 22:22:54 UTC (rev 1266)
@@ -4,7 +4,7 @@
 Maintainer: dann frazier <dannf@debian.org>
 Uploaders: Bdale Garbee <bdale@gag.com>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), modutils, kernel-patch-2.4.26-ia64 (>= 2.4.26-2), kernel-tree-2.4.26-5, kernel-package (>= 8.042), bzip2
+Build-Depends: debhelper (>= 2), modutils, kernel-patch-2.4.26-ia64 (>= 2.4.26-2), kernel-tree-2.4.26-6, kernel-package (>= 8.042), bzip2
 
 Package: kernel-headers-2.4.26-1
 Architecture: ia64