[pve-devel] r6097 - pve-kernel-2.6.32/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-17 06:49:18 +0200 (Fri, 17 Jun 2011)
New Revision: 6097

Added:
   pve-kernel-2.6.32/pve2/linux-2.6_2.6.32-35.diff.gz
Removed:
   pve-kernel-2.6.32/pve2/linux-2.6_2.6.32-29.diff.gz
Modified:
   pve-kernel-2.6.32/pve2/Makefile
   pve-kernel-2.6.32/pve2/changelog.Debian
Log:


Modified: pve-kernel-2.6.32/pve2/Makefile
===================================================================
--- pve-kernel-2.6.32/pve2/Makefile	2011-06-16 13:28:46 UTC (rev 6096)
+++ pve-kernel-2.6.32/pve2/Makefile	2011-06-17 04:49:18 UTC (rev 6097)
@@ -1,10 +1,10 @@
-RELEASE=1.7
+RELEASE=2.0
 
 KERNEL_VER=2.6.32
-PKGREL=30
+PKGREL=35
 KREL=4
 
-KERNEL_DEB_REL=29
+KERNEL_DEB_REL=35
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
@@ -137,7 +137,6 @@
 	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 <../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
@@ -285,6 +284,6 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000E} e1000e.ko ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME}
+	rm -rf *~ .compile_mark config-2.6.32 ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} scst-src ${ISCSIDIR} ${ISCSI_DEB} iscsi-scst.ko scst-modules.tar ${SCSTDIR} put_page_callback-2.6.32.patch fwdata fwlist.tmp iscsideb/*~ iscsi-scst_* *.ko ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko fwlist-${KVNAME}
 
 

Modified: pve-kernel-2.6.32/pve2/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/pve2/changelog.Debian	2011-06-16 13:28:46 UTC (rev 6096)
+++ pve-kernel-2.6.32/pve2/changelog.Debian	2011-06-17 04:49:18 UTC (rev 6097)
@@ -1,3 +1,13 @@
+pve-kernel-2.6.32 (2.6.32-35) unstable; urgency=low
+
+  * update to debian squeeze kernel 2.6.32-35
+  
+  * remove patch use-init-task-credential.patch (fixed in upstream)
+  
+  * enable CONFIG_SENSORS_K10TEMP=m
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 17 Jun 2011 06:45:42 +0200
+
 pve-kernel-2.6.32 (2.6.32-30) unstable; urgency=low
 
   * update to debian squeeze kernel 2.6.32-29

Deleted: pve-kernel-2.6.32/pve2/linux-2.6_2.6.32-29.diff.gz
===================================================================
(Binary files differ)

Added: pve-kernel-2.6.32/pve2/linux-2.6_2.6.32-35.diff.gz
===================================================================
(Binary files differ)


Property changes on: pve-kernel-2.6.32/pve2/linux-2.6_2.6.32-35.diff.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream