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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-24 08:04:11 +0200 (Fri, 24 Jun 2011)
New Revision: 6147

Modified:
   pve-kernel-2.6.32-rh/trunk/Makefile
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-06-24 05:57:18 UTC (rev 6146)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-06-24 06:04:11 UTC (rev 6147)
@@ -1,7 +1,9 @@
 RELEASE=1.8
 
+# fixme: re-enable pu-page-callback patch
+
 KERNEL_VER=2.6.32
-PKGREL=1
+PKGREL=36
 # alsp include priv firmware into the fw package  fwlist-2.6.32-PREV-pve
 KREL=6
 
@@ -154,7 +156,7 @@
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/scst_exec_req_fifo-2.6.32.patch
 	cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/io_context-2.6.32.patch
 	#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/readahead-2.6.32.patch
-	cd ${KERNEL_SRC}; patch -p1 <../put_page_callback-2.6.32.patch
+	#cd ${KERNEL_SRC}; patch -p1 <../put_page_callback-2.6.32.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 
@@ -314,10 +316,10 @@
 
 .PHONY: distclean
 distclean: clean
-	rm -rf linux-firmware.git linux-firmware-from-kernel.git	
+	rm -rf linux-firmware.git linux-firmware-from-kernel.git ${KERNEL_SRC}.org ${RHKERSRCDIR}
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark ${KERNEL_CFG} ${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} ${ARECADIR} arcmsr.ko
+	rm -rf *~ .compile_mark ${KERNEL_CFG} ${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} ${ARECADIR} arcmsr.ko 
 
 

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-06-24 05:57:18 UTC (rev 6146)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-06-24 06:04:11 UTC (rev 6147)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-36) unstable; urgency=low
+
+  * use kernel from OpenVZ project as base
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 24 Jun 2011 08:01:39 +0200
+
 pve-kernel-2.6.32 (2.6.32-35) unstable; urgency=low
 
   * fix register corruption in pvclock_scale_delta