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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-03-08 06:32:54 +0100 (Tue, 08 Mar 2011)
New Revision: 5655

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
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2011-03-08 05:24:45 UTC (rev 5654)
+++ pve-kernel-2.6.32/trunk/Makefile	2011-03-08 05:32:54 UTC (rev 5655)
@@ -137,7 +137,7 @@
 	tar xf ${KERNEL_SRC_TAR}	
 	zcat ${KERNEL_DEB_DIFF}|patch -p1 -d ${KERNEL_SRC}
 	./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
-	cd ${KERNEL_SRC}; patch -p1 <../use-init-task-credential.patch
+	#cd ${KERNEL_SRC}; patch -p1 <../use-init-task-credential.patch
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch 
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/scst_exec_req_fifo-2.6.32.patch

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2011-03-08 05:24:45 UTC (rev 5654)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2011-03-08 05:32:54 UTC (rev 5655)
@@ -1,6 +1,10 @@
 pve-kernel-2.6.32 (2.6.32-31) unstable; urgency=low
 
-  *  update to debian squeeze kernel 2.6.32-31
+  * update to debian squeeze kernel 2.6.32-31
+  
+  * remove patch use-init-task-credential.patch (fixed in upstream)
+  
+  * enable CONFIG_SENSORS_K10TEMP=m
 
  -- Proxmox Support Team <support at proxmox.com>  Tue, 08 Mar 2011 06:18:31 +0100
 

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2011-03-08 05:24:45 UTC (rev 5654)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2011-03-08 05:32:54 UTC (rev 5655)
@@ -1,12 +1,12 @@
 --- config-2.6.32.org	2010-10-21 09:00:42.000000000 +0200
-+++ config-2.6.32	2010-12-15 13:46:09.000000000 +0100
++++ config-2.6.32	2011-03-08 06:31:20.000000000 +0100
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.32
 -# Tue Oct 19 23:25:36 2010
 +# Linux kernel version: 2.6.32-4-pve
-+# Wed Dec 15 13:45:35 2010
++# Tue Mar  8 06:30:42 2011
  #
  CONFIG_64BIT=y
  # CONFIG_X86_32 is not set
@@ -87,7 +87,15 @@
  CONFIG_QLGE=m
  CONFIG_SFC=m
  CONFIG_SFC_MTD=y
-@@ -2780,6 +2782,7 @@
+@@ -2698,6 +2700,7 @@
+ CONFIG_SENSORS_ADT7473=m
+ CONFIG_SENSORS_ADT7475=m
+ CONFIG_SENSORS_K8TEMP=m
++CONFIG_SENSORS_K10TEMP=m
+ CONFIG_SENSORS_ASB100=m
+ CONFIG_SENSORS_ATXP1=m
+ CONFIG_SENSORS_DS1621=m
+@@ -2780,6 +2783,7 @@
  CONFIG_ADVANTECH_WDT=m
  CONFIG_ALIM1535_WDT=m
  CONFIG_ALIM7101_WDT=m
@@ -95,7 +103,7 @@
  CONFIG_SC520_WDT=m
  CONFIG_SBC_FITPC2_WATCHDOG=m
  CONFIG_EUROTECH_WDT=m
-@@ -3392,6 +3395,11 @@
+@@ -3392,6 +3396,11 @@
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
@@ -107,7 +115,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-@@ -4008,6 +4016,7 @@
+@@ -4008,6 +4017,7 @@
  # CONFIG_POCH is not set
  CONFIG_BRCM80211=m
  CONFIG_BRCM80211_PCI=y
@@ -115,7 +123,7 @@
  CONFIG_RT2860=m
  CONFIG_RT2870=m
  CONFIG_COMEDI=m
-@@ -4442,7 +4451,7 @@
+@@ -4442,7 +4452,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -124,7 +132,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4479,7 +4488,7 @@
+@@ -4479,7 +4489,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -133,7 +141,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4578,7 +4587,7 @@
+@@ -4578,7 +4588,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -142,7 +150,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4722,7 +4731,7 @@
+@@ -4722,7 +4732,7 @@
  CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m