[pve-devel] r5180 - pve-kernel-2.6.24/trunk

Mon Sep 20 12:41:30 CEST 2010

Author: dietmar
Date: 2010-09-20 10:41:29 +0000 (Mon, 20 Sep 2010)
New Revision: 5180

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


Modified: pve-kernel-2.6.24/trunk/Makefile
===================================================================

--- pve-kernel-2.6.24/trunk/Makefile	2010-09-20 09:20:27 UTC (rev 5179)
+++ pve-kernel-2.6.24/trunk/Makefile	2010-09-20 10:41:29 UTC (rev 5180)
@@ -1,7 +1,7 @@
-RELEASE=1.5
+RELEASE=1.6
 
 KERNEL_VER=2.6.24
-PKGREL=24
+PKGREL=25
 
 KREL=12
 
@@ -36,7 +36,7 @@
 HPTMVSRC=${HPTMVDIR}-080307-1905.tar.gz
 
 # ubuntu hardy openvz git branch
-UHO_BRANCH=Ubuntu-2.6.24-28.71
+UHO_BRANCH=Ubuntu-2.6.24-28.79
 
 # ubuntu hardy lbm git branch
 LBM_BRANCH=Ubuntu-2.6.24-27.36
@@ -54,9 +54,9 @@
 PVEPKG=proxmox-ve-${KERNEL_VER}
 PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 
-FW_VER=1.0
-FW_REL=5
-FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
+#FW_VER=1.0
+#FW_REL=5
+#FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 KSRCNAME=pve-kernel-sources-${KERNEL_VER}-${PKGREL}.tgz
 
@@ -68,7 +68,7 @@
 
 headers_tmp := $(CURDIR)/tmp-headers
 
-all: check_gcc ${DST_DEB} ${FW_DEB} ${PVE_DEB} ${HDR_DEB} ${ISCSI_DEB}
+all: check_gcc ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${ISCSI_DEB}
 
 ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
 	rm -rf proxmox-ve/data
@@ -146,21 +146,12 @@
 #	git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git linux-firmware.git
 
 # we include firmware for scsi in initrd
-${FW_DEB} initrdfirmware.tar: control.firmware firmware.tar lbmfirmware.tar firmware-2.6.32.tgz
+initrdfirmware.tar: control.firmware firmware.tar lbmfirmware.tar firmware-2.6.32.tgz
 	rm -rf fwdata
 	mkdir -p fwdata/lib
 	tar xf firmware.tar -C fwdata/lib/
 	tar xf lbmfirmware.tar -C fwdata/lib/
 	tar xf firmware-2.6.32.tgz -C fwdata/
-	install -d fwdata/usr/share/doc/pve-firmware
-	#cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
-	#install -d fwdata/usr/share/doc/pve-firmware/licenses
-	#mv fwdata/lib/firmware/LICEN[CS]E* fwdata/usr/share/doc/pve-firmware/licenses
-	install -D -m 0644 changelog.firmware fwdata/usr/share/doc/pve-firmware/changelog.Debian
-	gzip -9 fwdata/usr/share/doc/pve-firmware/changelog.Debian	
-	install -d fwdata/DEBIAN
-	sed -e 's/@VERSION@/${FW_VER}-${FW_REL}/' <control.firmware >fwdata/DEBIAN/control
-	dpkg-deb --build fwdata ${FW_DEB}
 	mkdir -p fwdata/initrd/firmware
 	cp fwdata/lib/firmware/ql*_fw.bin fwdata/initrd/firmware
 	cp fwdata/lib/firmware/aic94xx* fwdata/initrd/firmware
@@ -427,7 +418,7 @@
 	#lintian ${HDR_DEB}
 
 .PHONY: upload
-upload: ${DST_DEB} ${FW_DEB} ${PVE_DEB} ${KSRCNAME} ${HDR_DEB} ${ISCSI_DEB}
+upload: ${DST_DEB} ${PVE_DEB} ${KSRCNAME} ${HDR_DEB} ${ISCSI_DEB}
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
 	mkdir -p /pve/${RELEASE}/extra
 	rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
@@ -437,14 +428,14 @@
 	rm -rf /pve/${RELEASE}/extra/iscsi-scst*.deb
 	rm -rf /pve/${RELEASE}/extra/Packages*
 	rm -rf /pve/${RELEASE}/install/pve-kernel-source*.tgz
-	cp ${DST_DEB} ${FW_DEB} ${PVE_DEB} ${HDR_DEB} ${ISCSI_DEB} /pve/${RELEASE}/extra
+	cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${ISCSI_DEB} /pve/${RELEASE}/extra
 	cp ${KSRCNAME} /pve/${RELEASE}/install
 	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
 	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
 
 .PHONY: clean
 clean:
-	rm -rf build ${ISCSI_DEB} ${KERNEL_SRC} ${PVE_DEB} ${DST_DEB} ${FW_DEB} ${DRBDDIR} ${HDR_DEB} *~ .compile_mark data testboot *.iso tmp initrd.img-* ${BUSYBOXDIR} busybox busybox.tar sbin pci.ids drbd.ko lum lum.tar lbm lbm.tar firmware.tar lbmfirmware.tar firmware build fwdata kvm-modules.tar ${KVMMODDIR} initrdfirmware.tar latest aoe.ko ${AOEDIR} *.tmp ${headers_tmp} ${IGBDIR} igb.ko ${E1000DIR} e1000.ko ${E1000EDIR} e1000e.ko ${HPTDIR} hptiop.ko ${HPTMVDIR} hptmviop.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko ${TG3DIR} tg3.ko ${ARECADIR} arcmsr.ko ${SCSTDIR} scst-modules.tar ${ISCSIDIR} iscsi-scst.ko iscsi-scst_*  proxmox-ve/data scst-src pve-kernel-source*.tgz
+	rm -rf build ${ISCSI_DEB} ${KERNEL_SRC} ${PVE_DEB} ${DST_DEB} ${DRBDDIR} ${HDR_DEB} *~ .compile_mark data testboot *.iso tmp initrd.img-* ${BUSYBOXDIR} busybox busybox.tar sbin pci.ids drbd.ko lum lum.tar lbm lbm.tar firmware.tar lbmfirmware.tar firmware build fwdata kvm-modules.tar ${KVMMODDIR} initrdfirmware.tar latest aoe.ko ${AOEDIR} *.tmp ${headers_tmp} ${IGBDIR} igb.ko ${E1000DIR} e1000.ko ${E1000EDIR} e1000e.ko ${HPTDIR} hptiop.ko ${HPTMVDIR} hptmviop.ko ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko ${TG3DIR} tg3.ko ${ARECADIR} arcmsr.ko ${SCSTDIR} scst-modules.tar ${ISCSIDIR} iscsi-scst.ko iscsi-scst_*  proxmox-ve/data scst-src pve-kernel-source*.tgz
 
 .PHONY: distclean
 distclean: clean

Modified: pve-kernel-2.6.24/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.24/trunk/changelog.Debian	2010-09-20 09:20:27 UTC (rev 5179)
+++ pve-kernel-2.6.24/trunk/changelog.Debian	2010-09-20 10:41:29 UTC (rev 5180)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.24 (2.6.24-25) unstable; urgency=low
+
+  * update to Ubuntu-2.6.24-28.7 (fix CVE-2010-3081)
+
+ -- Proxmox Support Team <support at proxmox.com>  Mon, 20 Sep 2010 12:35:04 +0200
+
 pve-kernel-2.6.24 (2.6.24-24) unstable; urgency=low
 
   * update to Ubuntu-2.6.24-28.71


