[pve-devel] r6148 - pve-kernel-2.6.32-rh/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 24 08:19:21 CEST 2011


Author: dietmar
Date: 2011-06-24 08:19:21 +0200 (Fri, 24 Jun 2011)
New Revision: 6148

Modified:
   pve-kernel-2.6.32-rh/trunk/README
   pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff
Log:


Modified: pve-kernel-2.6.32-rh/trunk/README
===================================================================
--- pve-kernel-2.6.32-rh/trunk/README	2011-06-24 06:04:11 UTC (rev 6147)
+++ pve-kernel-2.6.32-rh/trunk/README	2011-06-24 06:19:21 UTC (rev 6148)
@@ -1,20 +1,17 @@
 KERNEL SOURCE:
 ==============
 
-We use the Debian kernel sources, available from:
+We use the OpenVZ Kernel sources, available from:
 
-ftp://ftp.debian.org/debian/pool/main/l/linux-2.6/linux-2.6_2.6.32.orig.tar.gz
-ftp://ftp.debian.org/debian/pool/main/l/linux-2.6/linux-2.6_2.6.32-XX.diff.gz
 
+http://download.openvz.org/kernel/branches/rhel6-2.6.32/
+
+
 Additional/Updated Modules:
 ---------------------------
 
 - we use bootsplash to display the boot logo.
 
-- with openvz patches (featureset=openvz).
-
-- with PVE initrd which does hardware auto-detection.
-
 - include latest AoE driver (http://support.coraid.com/support/linux)
 
 - include latest ixgbe driver from intel/sourceforge
@@ -32,6 +29,7 @@
 
   * ftp://ftp.areca.com.tw/RaidCards/AP_Drivers/Linux/DRIVER/SourceCode/arcmsr.1.20.0X.15-110330.zip
 
+- incluse SCST patches
 
 FIRMWARE:
 =========
@@ -60,7 +58,7 @@
 PATCHES:
 --------
 
- bootsplash-3.1.9-2.6.31.patch: bootsplash patch
+ bootsplash-3.1.9-2.6.31-rh.patch: bootsplash patch
 
  bridge-patch.diff: Avoid bridge problems with changing MAC
   see also: http://forum.openvz.org/index.php?t=msg&th=5291
@@ -73,8 +71,8 @@
 Additional information
 ----------------------
 
-We use the debian default configuration extracted from the binary
-openvz-amd64 kernel image.
+We use the default configuration provided by openvz, and apply
+the following modification:
 
 see config-2.6.32.diff
 
@@ -85,26 +83,11 @@
 
 - disable CONFIG_DEBUG_INFO
 
-- enable DLM debug
-  	 CONFIG_DLM_DEBUG=y
-
 - disable CONFIG_PRINTK_TIME
 
-- enable options for PCI pass through for KVM
-  	 CONFIG_HAVE_INTEL_TXT=y
-	 CONFIG_INTEL_TXT=y
-	 CONFIG_DMAR=y
-	 CONFIG_PCI_STUB=y
-
-  We do not enable DMAR by default (CONFIG_DMAR_DEFAULT_ON=n), because
-  several users reported problems with that option. You can still
-  eanble it using intel_iommu=on boot option.
-
 - enable zero copy patch for SCST
 	 CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION=y
 
-- disable KSM (OpenVZ does not support that for now)
-
 - enable common CONFIG_BLK_DEV_XXX to avoid hardware detection
   problems (udev, undate-initramfs hav serious problems without that)
 
@@ -112,12 +95,7 @@
   	 CONFIG_BLK_DEV_SR=y
   	 CONFIG_BLK_DEV_DM=y
  
-- enable loopback, because it is commonly used for disk manipulations.
 
-  	 CONFIG_BLK_DEV_LOOP=y
-
-- enable CONFIG_NF_CONNTRACK_IPV=m
-
 Testing final kernel with kvm
 -----------------------------
 

Modified: pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff	2011-06-24 06:04:11 UTC (rev 6147)
+++ pve-kernel-2.6.32-rh/trunk/config-2.6.32.diff	2011-06-24 06:19:21 UTC (rev 6148)
@@ -1,5 +1,5 @@
---- config-2.6.32-042stab018.1.x86_64	2011-06-17 10:15:37.000000000 +0200
-+++ config-2.6.32	2011-06-23 10:01:59.000000000 +0200
+--- config-2.6.32-042stab018.1.x86_64	2011-06-24 07:48:34.000000000 +0200
++++ config-2.6.32	2011-06-24 08:17:38.000000000 +0200
 @@ -101,7 +101,7 @@
  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
  CONFIG_GROUP_SCHED=y
@@ -18,6 +18,28 @@
  # CONFIG_MODULE_SIG_FORCE is not set
  CONFIG_MODULE_VERIFY=y
  CONFIG_STOP_MACHINE=y
+@@ -1322,10 +1322,10 @@
+ #
+ # 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_SCH=m
+@@ -1523,7 +1523,7 @@
+ # CONFIG_MULTICORE_RAID456 is not set
+ # CONFIG_MD_MULTIPATH is not set
+ CONFIG_MD_FAULTY=m
+-CONFIG_BLK_DEV_DM=m
++CONFIG_BLK_DEV_DM=y
+ CONFIG_DM_DEBUG=y
+ CONFIG_DM_CRYPT=m
+ CONFIG_DM_SNAPSHOT=m
 @@ -3092,6 +3092,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
@@ -30,3 +52,21 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+@@ -4043,7 +4048,7 @@
+ # Kernel hacking
+ #
+ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+-CONFIG_PRINTK_TIME=y
++# CONFIG_PRINTK_TIME is not set
+ # CONFIG_ENABLE_WARN_DEPRECATED is not set
+ CONFIG_ENABLE_MUST_CHECK=y
+ CONFIG_FRAME_WARN=2048
+@@ -4087,7 +4092,7 @@
+ CONFIG_STACKTRACE=y
+ # CONFIG_DEBUG_KOBJECT is not set
+ CONFIG_DEBUG_BUGVERBOSE=y
+-CONFIG_DEBUG_INFO=y
++# CONFIG_DEBUG_INFO is not set
+ # CONFIG_DEBUG_VM is not set
+ # CONFIG_DEBUG_VIRTUAL is not set
+ # CONFIG_DEBUG_WRITECOUNT is not set



More information about the pve-devel mailing list