r2212 - in trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8: . config debian

Norbert Tretkowski nobse@costa.debian.org
Sun, 09 Jan 2005 11:28:35 +0100 

Author: nobse
Date: 2005-01-09 11:28:33 +0100 (Sun, 09 Jan 2005)
New Revision: 2212

Modified:
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/default
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/control
   trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/post-install
Log:
built against kernel-tree 2.6.8-13


Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/default
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/default	2005-01-09 04:58:18 UTC (rev 2211)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/default	2005-01-09 10:28:33 UTC (rev 2212)
@@ -259,7 +259,6 @@
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
 CONFIG_AIC7XXX_RESET_DELAY_MS=5000
 # CONFIG_AIC7XXX_PROBE_EISA_VL is not set
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set
 CONFIG_AIC7XXX_DEBUG_MASK=0
 CONFIG_AIC7XXX_REG_PRETTY_PRINT=y

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic	2005-01-09 04:58:18 UTC (rev 2211)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/generic	2005-01-09 10:28:33 UTC (rev 2212)
@@ -27,7 +27,7 @@
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HOTPLUG=y
 # CONFIG_IKCONFIG is not set
-CONFIG_EMBEDDED=y
+# CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -37,7 +37,7 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
 #
 # Loadable module support
@@ -401,7 +401,6 @@
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIC7XXX_PROBE_EISA_VL=y
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
 CONFIG_AIC7XXX_DEBUG_ENABLE=y
 CONFIG_AIC7XXX_DEBUG_MASK=0
 CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
@@ -409,7 +408,6 @@
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
 CONFIG_AIC79XX_ENABLE_RD_STRM=y
 CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_DEBUG_MASK=0
@@ -461,6 +459,7 @@
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_SIM710=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -593,7 +592,6 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -633,7 +631,6 @@
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -1405,7 +1402,7 @@
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -1494,7 +1491,6 @@
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-# CONFIG_DIGIEPCA is not set
 # CONFIG_DIGI is not set
 # CONFIG_ESPSERIAL is not set
 CONFIG_MOXA_INTELLIO=m
@@ -2275,7 +2271,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
@@ -2285,7 +2281,7 @@
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
@@ -2510,7 +2506,7 @@
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+CONFIG_SECURITY_CAPABILITIES=y
 CONFIG_SECURITY_ROOTPLUG=m
 # CONFIG_SECURITY_SELINUX is not set
 

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp	2005-01-09 04:58:18 UTC (rev 2211)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/config/smp	2005-01-09 10:28:33 UTC (rev 2212)
@@ -26,7 +26,7 @@
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_HOTPLUG=y
 # CONFIG_IKCONFIG is not set
-CONFIG_EMBEDDED=y
+# CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -36,7 +36,7 @@
 CONFIG_IOSCHED_AS=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 
 #
 # Loadable module support
@@ -403,7 +403,6 @@
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIC7XXX_PROBE_EISA_VL=y
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
 CONFIG_AIC7XXX_DEBUG_ENABLE=y
 CONFIG_AIC7XXX_DEBUG_MASK=0
 CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
@@ -411,7 +410,6 @@
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
 CONFIG_AIC79XX_ENABLE_RD_STRM=y
 CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_DEBUG_MASK=0
@@ -463,6 +461,7 @@
 CONFIG_SCSI_QLOGIC_FC=m
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLOGIC_1280_1040=y
 CONFIG_SCSI_SIM710=m
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -592,7 +591,6 @@
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
 
 #
 # IP: Virtual Server Configuration
@@ -632,7 +630,6 @@
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
 CONFIG_IPV6_TUNNEL=m
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -1387,7 +1384,7 @@
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
@@ -2217,7 +2214,7 @@
 #
 # File systems
 #
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_XATTR=y
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
@@ -2227,7 +2224,7 @@
 CONFIG_EXT3_FS_SECURITY=y
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
+CONFIG_FS_MBCACHE=m
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_PROC_INFO is not set
@@ -2452,7 +2449,7 @@
 #
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+CONFIG_SECURITY_CAPABILITIES=y
 CONFIG_SECURITY_ROOTPLUG=m
 # CONFIG_SECURITY_SELINUX is not set
 

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog	2005-01-09 04:58:18 UTC (rev 2211)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/changelog	2005-01-09 10:28:33 UTC (rev 2212)
@@ -1,9 +1,14 @@
 kernel-image-2.6.8-alpha (2.6.8-7) unstable; urgency=high
 
-  * built against kernel-tree 2.6.8-11
-  * bumped soname
+  * built against kernel-tree 2.6.8-13
+    + added backport of qla1280 driver from 2.6.10 (closes: #261893)
+  * bumped SONAME because of ABI changes in one of the security fixes from
+    kernel-source-2.6.8 2.6.8-11
+  * enabled CONFIG_SCSI_QLOGIC_1280_1040
+  * compiled CONFIG_SECURITY_CAPABILITIES into kernel
+  * compiled CONFIG_EXT2_FS as module
 
- -- Norbert Tretkowski <nobse@debian.org>  Tue, 28 Dec 2004 12:53:23 +0100
+ -- Norbert Tretkowski <nobse@debian.org>  Sat, 08 Jan 2005 16:56:12 +0100
 
 kernel-image-2.6.8-alpha (2.6.8-6) unstable; urgency=high
 

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/control
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/control	2005-01-09 04:58:18 UTC (rev 2211)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/debian/control	2005-01-09 10:28:33 UTC (rev 2212)
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Norbert Tretkowski <nobse@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-11, module-init-tools
+Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-13, module-init-tools
 
 Package: kernel-headers-2.6.8-2
 Architecture: alpha

Modified: trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/post-install
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/post-install	2005-01-09 04:58:18 UTC (rev 2211)
+++ trunk/kernel/alpha/kernel-image-2.6.8-alpha-2.6.8/post-install	2005-01-09 10:28:33 UTC (rev 2212)
@@ -68,4 +68,4 @@
 cd $IMAGE_TOP/lib/modules/$version
 mkdir boot initrd
 ln kernel/drivers/video/tgafb.ko initrd
-ln kernel/security/capability.ko boot
+#ln kernel/security/capability.ko boot