compile NBD and RBD modules

And set CONFIG_BLK_DEV_LOOP_MIN_COUNT=8

diff --git a/Makefile b/Makefile
index ccc2a58611f9d047f389e8e50abdc69e85cfec74..429923c7d63c81daa9b9e5c62a50311fd5225143 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.2
 
 KERNEL_VER=3.10.0
-PKGREL=7
+PKGREL=8
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=2

diff --git a/README b/README
index 0d005c9bc558f42c685435f46ee9a09cb51ea8ec..a3c8a01cd39b7c115c9128fa0e391b8ab0b2491b 100644 (file)
--- a/README
+++ b/README
@@ -80,6 +80,13 @@ see config-3.10.0.diff
         CONFIG_BLK_DEV_SR=y
         CONFIG_BLK_DEV_DM=y
 
+- compile NBD and RBD modules
+        CONFIG_BLK_DEV_NBD=m
+        CONFIG_BLK_DEV_RBD=m
+
+- set LOOP_MIN_COUNT to 8 (debian defaults)
+        CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+
 - disable module signatures (CONFIG_MODULE_SIG)
  
 - enable IBM JFS file system 

diff --git a/changelog.Debian b/changelog.Debian
index e7a8a3068113b5cb783529174e0cc7b3040c94f3..11b8deaf304c80c819c805fb2072402f39ff9170 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,11 @@
+pve-kernel-3.10.0 (3.10.0-8) unstable; urgency=low
+
+  * compile NBD and RBD modules
+  
+  * set CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 24 Apr 2014 10:22:35 +0200
+
 pve-kernel-3.10.0 (3.10.0-7) unstable; urgency=low
 
   * update to kernel-3.10.0-121.el7.src.rpm

diff --git a/config-3.10.0.diff b/config-3.10.0.diff
index 013a84fd74311ae8aae213b39037cfbdbd65cfc8..dbc5b5b563eb7c692f39278b8e34fb9a2a565e11 100644 (file)
--- a/config-3.10.0.diff
+++ b/config-3.10.0.diff
@@ -1,5 +1,5 @@
 --- rh-kernel-src/kernel-3.10.0-x86_64.config  2014-04-23 09:14:23.000000000 +0200
-+++ config-3.10.0      2014-04-23 09:52:16.000000000 +0200
++++ config-3.10.0      2014-04-24 10:28:36.000000000 +0200
 @@ -1,7 +1,6 @@
 -# x86_64
  #
@@ -72,17 +72,41 @@
  # CONFIG_LLC2 is not set
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
-@@ -1437,7 +1427,8 @@
+@@ -1303,6 +1293,9 @@
+ # CONFIG_NET_9P is not set
+ # CONFIG_CAIF is not set
+ # CONFIG_CEPH_LIB is not set
++CONFIG_CEPH_LIB=m
++# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
++# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+ # CONFIG_NFC is not set
+ CONFIG_HAVE_BPF_JIT=y
+ 
+@@ -1435,10 +1428,11 @@
+ # CONFIG_BLK_DEV_UMEM is not set
+ # CONFIG_BLK_DEV_COW_COMMON is not set
  CONFIG_BLK_DEV_LOOP=m
- CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
+-CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
++CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 -# CONFIG_BLK_DEV_DRBD is not set
+-# CONFIG_BLK_DEV_NBD 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_NBD=m
  CONFIG_BLK_DEV_NVME=m
  CONFIG_BLK_DEV_OSD=m
-@@ -1531,10 +1522,10 @@
+ CONFIG_BLK_DEV_SX8=m
+@@ -1453,7 +1447,7 @@
+ CONFIG_XEN_BLKDEV_FRONTEND=m
+ CONFIG_VIRTIO_BLK=m
+ # CONFIG_BLK_DEV_HD is not set
+-# CONFIG_BLK_DEV_RBD is not set
++CONFIG_BLK_DEV_RBD=m
+ # CONFIG_BLK_DEV_RSXX is not set
+ 
+ #
+@@ -1531,10 +1525,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -95,7 +119,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1754,7 +1745,7 @@
+@@ -1754,7 +1748,7 @@
  CONFIG_MD_FAULTY=m
  # CONFIG_BCACHE is not set
  CONFIG_BLK_DEV_DM_BUILTIN=y
@@ -104,7 +128,7 @@
  CONFIG_DM_DEBUG=y
  CONFIG_DM_BUFIO=m
  CONFIG_DM_BIO_PRISON=m
-@@ -4542,7 +4533,11 @@
+@@ -4542,7 +4536,11 @@
  # CONFIG_JBD2_DEBUG is not set
  CONFIG_FS_MBCACHE=m
  # CONFIG_REISERFS_FS is not set
@@ -117,7 +141,7 @@
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
  CONFIG_XFS_POSIX_ACL=y
-@@ -4631,8 +4626,8 @@
+@@ -4631,8 +4629,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_ECRYPT_FS is not set
@@ -128,7 +152,7 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -4769,7 +4764,7 @@
+@@ -4769,7 +4767,7 @@
  CONFIG_NLS_MAC_INUIT=m
  CONFIG_NLS_MAC_ROMANIAN=m
  CONFIG_NLS_MAC_TURKISH=m
@@ -137,7 +161,7 @@
  CONFIG_DLM=m
  CONFIG_DLM_DEBUG=y
  
-@@ -4958,8 +4953,8 @@
+@@ -4958,8 +4956,8 @@
  CONFIG_KEYS=y
  CONFIG_PERSISTENT_KEYRINGS=y
  CONFIG_BIG_KEYS=y
@@ -148,7 +172,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  # CONFIG_SECURITY_DMESG_RESTRICT is not set
  CONFIG_SECURITY=y
-@@ -4971,9 +4966,8 @@
+@@ -4971,9 +4969,8 @@
  CONFIG_INTEL_TXT=y
  CONFIG_LSM_MMAP_MIN_ADDR=65535
  CONFIG_SECURITY_SELINUX=y
@@ -160,7 +184,7 @@
  CONFIG_SECURITY_SELINUX_DEVELOP=y
  CONFIG_SECURITY_SELINUX_AVC_STATS=y
  CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-@@ -4992,9 +4986,9 @@
+@@ -4992,9 +4989,9 @@
  CONFIG_IMA_APPRAISE=y
  CONFIG_EVM=y
  CONFIG_EVM_HMAC_VERSION=2
@@ -173,7 +197,7 @@
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
  CONFIG_ASYNC_MEMCPY=m
-@@ -5066,7 +5060,7 @@
+@@ -5066,7 +5063,7 @@
  CONFIG_CRYPTO_CRC32C_INTEL=m
  CONFIG_CRYPTO_CRC32=m
  CONFIG_CRYPTO_CRC32_PCLMUL=m
@@ -182,7 +206,7 @@
  CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
  CONFIG_CRYPTO_GHASH=m
  CONFIG_CRYPTO_MD4=m
-@@ -5180,7 +5174,7 @@
+@@ -5180,7 +5177,7 @@
  CONFIG_CMPXCHG_LOCKREF=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
@@ -191,7 +215,7 @@
  CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
  # CONFIG_CRC32_SELFTEST is not set
-@@ -5227,6 +5221,7 @@
+@@ -5227,6 +5224,7 @@
  CONFIG_DQL=y
  CONFIG_NLATTR=y
  CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y