include correct rtl8168d-1.fw file

[pve-kernel-2.6.32.git] / Makefile

diff --git a/Makefile b/Makefile
index e03f03153fd8a41174f08de2a944197cb8809acd..b7c169e17dcb2a515256427085df4b11da9c15d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-RELEASE=2.0
+RELEASE=2.2
 
 KERNEL_VER=2.6.32
-PKGREL=63
+PKGREL=80
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=10
+KREL=16
 
-RHKVER=220.4.1.el6
-OVZVER=042stab049.6
+RHKVER=279.9.1.el6
+OVZVER=042stab062.2
 
 KERNELSRCRPM=vzkernel-${KERNEL_VER}-${OVZVER}.src.rpm
 
@@ -25,19 +25,19 @@ KERNEL_CFG=config-${KERNEL_VER}
 KERNEL_CFG_ORG=config-${KERNEL_VER}-${OVZVER}.x86_64
 
 FW_VER=1.0
-FW_REL=15
+FW_REL=21
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 AOEDIR=aoe6-77
 AOESRC=${AOEDIR}.tar.gz
 
-E1000EDIR=e1000e-1.9.5
+E1000EDIR=e1000e-2.1.4
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-3.3.6
+IGBDIR=igb-4.0.17
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.7.17
+IXGBEDIR=ixgbe-3.11.33
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 #ARECADIR=arcmsr.1.20.0X.15-110330
@@ -129,7 +129,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-042stab049
+       cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab062
        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 <../fix-aspm-policy.patch
@@ -158,7 +158,7 @@ aoe.ko aoe: .compile_mark ${AOESRC}
        cd ${AOEDIR}; make KVER=${KVNAME}
        cp ${AOEDIR}/linux/drivers/block/aoe/aoe.ko aoe.ko
 
-e1000e.ko e1000e: ${E1000ESRC}
+e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
        mkdir -p /lib/modules/${KVNAME}
@@ -166,7 +166,7 @@ e1000e.ko e1000e: ${E1000ESRC}
        cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
-igb.ko igb: ${IGBSRC}
+igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
        mkdir -p /lib/modules/${KVNAME}
@@ -174,7 +174,7 @@ igb.ko igb: ${IGBSRC}
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
-ixgbe.ko ixgbe: ${IXGBESRC}
+ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        mkdir -p /lib/modules/${KVNAME}
@@ -182,7 +182,7 @@ ixgbe.ko ixgbe: ${IXGBESRC}
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
-#arcmsr.ko: ${ARECASRC}
+#arcmsr.ko: .compile_mark ${ARECASRC}
 #      rm -rf ${ARECADIR}
 #      unzip ${ARECASRC}
 #      mkdir -p /lib/modules/${KVNAME}
@@ -190,12 +190,10 @@ ixgbe.ko ixgbe: ${IXGBESRC}
 #      cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} CONFIG_SCSI_ARCMSR=m SUBDIRS=${TOP}/${ARECADIR} modules
 #      cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
-iscsi_trgt.ko: ${ISCSITARGETSRC}
+iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
        rm -rf ${ISCSITARGETDIR}
        tar xf ${ISCSITARGETSRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${ISCSITARGETDIR}; make KVER=${KVNAME}
+       cd ${ISCSITARGETDIR}; make KSRC=${TOP}/${KERNEL_SRC}
        cp ${ISCSITARGETDIR}/kernel/iscsi_trgt.ko iscsi_trgt.ko
 
 headers_tmp := $(CURDIR)/tmp-headers
@@ -225,9 +223,9 @@ ${HDR_DEB} hdr: .compile_mark headers-control.in headers-postinst.in
        #lintian ${HDR_DEB}
 
 linux-firmware.git/WHENCE:
-       git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git linux-firmware.git
+       git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git linux-firmware.git
 
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-15-pve fwlist-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -239,6 +237,9 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwli
        ./assemble-firmware.pl fwlist-2.6.32-5-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.32-6-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-2.6.35-1-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-2.6.32-13-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-2.6.32-14-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-2.6.32-15-pve fwdata/lib/firmware
        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