X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=0ac83f7d747b04867b85e84e5c57b1fcf89edcf0;hb=54afc4fafdb00708021fb70de3721452d58a15c6;hp=88a28837dc659d88307edc5f00bfd5374b2647ee;hpb=9b49e4009f12616eae37a0652af2852d36d77693;p=pve-kernel-2.6.32.git

diff --git a/Makefile b/Makefile
index 88a2883..0ac83f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 RELEASE=3.4
 
 KERNEL_VER=2.6.32
-PKGREL=164
+PKGREL=183
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=41
+KREL=48
 
-RHKVER=504.30.3.el6
-OVZVER=042stab111.12
+RHKVER=642.6.1.el6
+OVZVER=042stab120.6
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -29,28 +29,28 @@ KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
 AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
-E1000EDIR=e1000e-3.1.0.2
+E1000EDIR=e1000e-3.3.5
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.2.18
+IGBDIR=igb-5.3.5.3
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-4.0.3
+IXGBEDIR=ixgbe-4.4.6
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-I40EDIR=i40e-1.2.38
+I40EDIR=i40e-1.5.22
 I40ESRC=${I40EDIR}.tar.gz
 
-BNX2DIR=netxtreme2-7.11.05
+BNX2DIR=netxtreme2-7.14.05
 BNX2SRC=${BNX2DIR}.tar.gz
 
-AACRAIDVER=1.2.1-40700
+AACRAIDVER=1.2.1-50667
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 AACRAIDDIR=aacraid
 
-HPSAVER=3.4.6
+HPSAVER=3.4.16
 HPSADIR=hpsa-${HPSAVER}
-HPSASRC=${HPSADIR}-170.tar.bz2
+HPSASRC=${HPSADIR}-145.tar.bz2
 
 MEGARAID_DIR=megaraid_sas-06.703.11.00
 MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
@@ -64,8 +64,8 @@ RR272XDIR=rr272x_1x-linux-src-v1.5
 ISCSITARGETDIR=iscsitarget-1.4.20.2
 ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
-OVSDIR=openvswitch-2.3.2
-OVSSRC=${OVSDIR}.tar.gz
+#OVSDIR=openvswitch-2.3.2
+#OVSSRC=${OVSDIR}.tar.gz
 
 SPLDIR=pkg-spl
 SPLSRC=pkg-spl.tar.gz
@@ -126,15 +126,15 @@ fwlist-${KVNAME} fwtest: data
 	cmp fwlist.tmp fwlist-2.6.32-20-pve
 	mv fwlist.tmp $@
 
-data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko openvswitch.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
+data: .compile_mark ${KERNEL_CFG} aoe.ko e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko iscsi_trgt.ko aacraid.ko megaraid_sas.ko rr272x_1x.ko arcmsr.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
 	install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
 	install -m 644 ${KERNEL_SRC}/arch/x86_64/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
 	cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
-	# install OVS driver
-	install -m 644 openvswitch.ko tmp/lib/modules/${KVNAME}/kernel/net/openvswitch/openvswitch.ko
+	## install OVS driver
+	#install -m 644 openvswitch.ko tmp/lib/modules/${KVNAME}/kernel/net/openvswitch/openvswitch.ko
 	# install latest aoe driver
 	install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
 	# install latest i40e driver
@@ -187,7 +187,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
 	rm -rf ${KERNEL_SRC}
 	cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31-rh.patch
-	cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab111
+	cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab120
 	cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
@@ -316,16 +316,16 @@ arcmsr.ko: .compile_mark ${ARECASRC}
 	cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
 	cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
-openvswitch.ko: .compile_mark ${OVSSRC}
-	rm -rf ${OVSDIR}
-	tar xf ${OVSSRC}
-	mkdir -p /lib/modules/${KVNAME}
-	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-	cd ${OVSDIR}; ln -s ../ovspatches/ patches; quilt push -a
-	cd ${OVSDIR}; ./boot.sh
-	cd ${OVSDIR}; ./configure --with-linux=${TOP}/${KERNEL_SRC}
-	cd ${OVSDIR}; make -C datapath/linux
-	cp ${OVSDIR}/datapath/linux/openvswitch.ko openvswitch.ko
+#openvswitch.ko: .compile_mark ${OVSSRC}
+#	rm -rf ${OVSDIR}
+#	tar xf ${OVSSRC}
+#	mkdir -p /lib/modules/${KVNAME}
+#	ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+#	cd ${OVSDIR}; ln -s ../ovspatches/ patches; quilt push -a
+#	cd ${OVSDIR}; ./boot.sh
+#	cd ${OVSDIR}; ./configure --with-linux=${TOP}/${KERNEL_SRC}
+#	cd ${OVSDIR}; make -C datapath/linux
+#	cp ${OVSDIR}/datapath/linux/openvswitch.ko openvswitch.ko
 
 ${SPL_MODULES}: .compile_mark ${SPLSRC}
 	rm -rf ${SPLDIR}
@@ -384,16 +384,7 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
 
 .PHONY: upload
 upload: ${DST_DEB} ${PVE_DEB} ${HDR_DEB}
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw 
-	mkdir -p /pve/${RELEASE}/extra
-	mkdir -p /pve/${RELEASE}/install
-	rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
-	rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
-	rm -rf /pve/${RELEASE}/extra/${PVEPKG}_*.deb
-	rm -rf /pve/${RELEASE}/extra/Packages*
-	cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} /pve/${RELEASE}/extra
-	cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
-	umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
+	tar -cf - ${DST_DEB} ${PVE_DEB} ${HDR_DEB} | ssh repoman@repo.proxmox.com upload --dist wheezy
 
 .PHONY: distclean
 distclean: clean
@@ -401,7 +392,7 @@ distclean: clean
 
 .PHONY: clean
 clean:
-	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${I40EDIR} ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${OVSDIR} openvswitch.ko ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}
+	rm -rf *~ .compile_mark ${KERNEL_CFG} ${KERNEL_SRC} tmp data proxmox-ve/data *.deb ${AOEDIR} aoe.ko ${headers_tmp} fwdata fwlist.tmp *.ko ${I40EDIR} ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} iscsi_trgt.ko ${ISCSITARGETDIR} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} megaraid_sas.ko ${MEGARAID_DIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}