enable DRBD

diff --git a/Makefile b/Makefile
index 1673a643ac15ef3bf09f8b7703d74559796d779b..47e492e3365e2d3c60f29bb4a3f0c824849d9bae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.1
 
 KERNEL_VER=3.10.0
-PKGREL=1
+PKGREL=2
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -135,7 +135,7 @@ data: .compile_mark ${KERNEL_CFG}
 
 ${KERNEL_CFG}: ${KERNEL_CFG_ORG} config-${KERNEL_VER}.diff
        cp ${KERNEL_CFG_ORG} ${KERNEL_CFG}.new
-       #patch --no-backup ${KERNEL_CFG}.new config-${KERNEL_VER}.diff
+       patch --no-backup ${KERNEL_CFG}.new config-${KERNEL_VER}.diff
        mv ${KERNEL_CFG}.new ${KERNEL_CFG}
 
 ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README

diff --git a/changelog.Debian b/changelog.Debian
index c038f8ff4e815fd6ad3e91304db58cdf00bbac6f..e38a1e5cd9dd134c0a2486345f0407e9cbd5c849 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-3.10.0 (3.10.0-2) unstable; urgency=low
+
+  * enable DRBD
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 13 Dec 2013 15:33:35 +0100
+
 pve-kernel-3.10.0 (3.10.0-1) unstable; urgency=low
 
   * first try

diff --git a/config-3.10.0.diff b/config-3.10.0.diff
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..588e0c68983928cccde074c2dc8aa9f6cac241f1 100644 (file)
--- a/config-3.10.0.diff
+++ b/config-3.10.0.diff
@@ -0,0 +1,20 @@
+--- rh-kernel-src/kernel-3.10.0-x86_64.config  2013-12-12 11:09:13.000000000 +0100
++++ linux-2.6-3.10.0/.config   2013-12-13 16:05:21.060958142 +0100
+@@ -1431,7 +1430,8 @@
+ CONFIG_BLK_DEV_LOOP=m
+ CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
+ # CONFIG_BLK_DEV_CRYPTOLOOP is not set
+-# CONFIG_BLK_DEV_DRBD is not set
++CONFIG_BLK_DEV_DRBD=m
++# CONFIG_DRBD_FAULT_INJECTION is not set
+ # CONFIG_BLK_DEV_NBD is not set
+ CONFIG_BLK_DEV_NVME=m
+ CONFIG_BLK_DEV_OSD=m
+@@ -5208,6 +5208,7 @@
+ CONFIG_DQL=y
+ CONFIG_NLATTR=y
+ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
++CONFIG_LRU_CACHE=m
+ CONFIG_AVERAGE=y
+ CONFIG_CLZ_TAB=y
+ CONFIG_CORDIC=m