[pve-devel] r5098 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-09-08 09:32:53 +0000 (Wed, 08 Sep 2010)
New Revision: 5098

Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/config-2.6.32.diff
   pve-kernel-2.6.32/trunk/headers-control.in
   pve-kernel-2.6.32/trunk/init
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-09-07 12:31:24 UTC (rev 5097)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-09-08 09:32:53 UTC (rev 5098)
@@ -3,7 +3,7 @@
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=21
 
-PKGREL=13
+PKGREL=14
 KREL=3
 
 EXTRAVERSION=-${KREL}-pve

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-07 12:31:24 UTC (rev 5097)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-09-08 09:32:53 UTC (rev 5098)
@@ -1,3 +1,12 @@
+pve-kernel-2.6.32 (2.6.32-14) unstable; urgency=low
+
+  * fix dependency for pve-headers (depend on pve-kernel)
+  
+  * enable common block devices (do not compile them as modules to avoid
+    problems with udev and update-initramfs)
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 07 Sep 2010 08:12:15 +0200
+
 pve-kernel-2.6.32 (2.6.32-13) unstable; urgency=low
 
   * carefully include a needed firmware files

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-09-07 12:31:24 UTC (rev 5097)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-09-08 09:32:53 UTC (rev 5098)
@@ -1,5 +1,5 @@
 --- config-2.6.32.org	2010-08-03 12:36:25.000000000 +0200
-+++ config-2.6.32	2010-09-01 16:26:28.000000000 +0200
++++ config-2.6.32	2010-09-08 11:28:43.000000000 +0200
 @@ -354,7 +354,7 @@
  CONFIG_HAVE_MLOCK=y
  CONFIG_HAVE_MLOCKED_PAGE_BIT=y
@@ -35,6 +35,49 @@
  CONFIG_IP_MULTICAST=y
  CONFIG_IP_ADVANCED_ROUTER=y
  CONFIG_ASK_IP_FIB_HASH=y
+@@ -1361,7 +1362,7 @@
+ CONFIG_BLK_DEV_DAC960=m
+ CONFIG_BLK_DEV_UMEM=m
+ # CONFIG_BLK_DEV_COW_COMMON is not set
+-CONFIG_BLK_DEV_LOOP=m
++CONFIG_BLK_DEV_LOOP=y
+ # CONFIG_BLK_DEV_CRYPTOLOOP is not set
+ CONFIG_BLK_DEV_DRBD=m
+ # CONFIG_DRBD_FAULT_INJECTION is not set
+@@ -1475,7 +1476,7 @@
+ # SCSI device support
+ #
+ CONFIG_RAID_ATTRS=m
+-CONFIG_SCSI=m
++CONFIG_SCSI=y
+ CONFIG_SCSI_DMA=y
+ CONFIG_SCSI_TGT=m
+ CONFIG_SCSI_NETLINK=y
+@@ -1484,12 +1485,12 @@
+ #
+ # SCSI support type (disk, tape, CD-ROM)
+ #
+-CONFIG_BLK_DEV_SD=m
++CONFIG_BLK_DEV_SD=y
+ CONFIG_CHR_DEV_ST=m
+ CONFIG_CHR_DEV_OSST=m
+-CONFIG_BLK_DEV_SR=m
++CONFIG_BLK_DEV_SR=y
+ CONFIG_BLK_DEV_SR_VENDOR=y
+-CONFIG_CHR_DEV_SG=m
++CONFIG_CHR_DEV_SG=y
+ CONFIG_CHR_DEV_SCH=m
+ CONFIG_SCSI_ENCLOSURE=m
+ CONFIG_SCSI_MULTI_LUN=y
+@@ -1681,7 +1682,7 @@
+ # CONFIG_ASYNC_RAID6_TEST is not set
+ CONFIG_MD_MULTIPATH=m
+ CONFIG_MD_FAULTY=m
+-CONFIG_BLK_DEV_DM=m
++CONFIG_BLK_DEV_DM=y
+ # CONFIG_DM_DEBUG is not set
+ CONFIG_DM_CRYPT=m
+ CONFIG_DM_SNAPSHOT=m
 @@ -3921,6 +3922,7 @@
  CONFIG_COMEDI_PCI_DRIVERS=m
  CONFIG_COMEDI_PCMCIA_DRIVERS=m

Modified: pve-kernel-2.6.32/trunk/headers-control.in
===================================================================
--- pve-kernel-2.6.32/trunk/headers-control.in	2010-09-07 12:31:24 UTC (rev 5097)
+++ pve-kernel-2.6.32/trunk/headers-control.in	2010-09-08 09:32:53 UTC (rev 5098)
@@ -3,8 +3,8 @@
 Section: devel
 Priority: optional
 Architecture: amd64
-Provides: linux-headers, linux-headers-2.6, pve-kernel- at KVNAME@
-Depends: coreutils | fileutils (>= 4.0)
+Provides: linux-headers, linux-headers-2.6
+Depends: coreutils | fileutils (>= 4.0), pve-kernel- at KVNAME@
 Maintainer: Proxmox Support Team <support at proxmox.com>
 Description: The Proxmox PVE Kernel Headers
  This package contains the linux kernel headers

Modified: pve-kernel-2.6.32/trunk/init
===================================================================
--- pve-kernel-2.6.32/trunk/init	2010-09-07 12:31:24 UTC (rev 5097)
+++ pve-kernel-2.6.32/trunk/init	2010-09-08 09:32:53 UTC (rev 5098)
@@ -65,7 +65,7 @@
     modprobe "$mod"
 done
 
-stdmod="usb-storage usbhid virtio_blk sr_mod sd_mod"
+stdmod="usb-storage usbhid virtio_blk"
 for mod in $stdmod; do 
     modprobe "$mod"
 done