add latest i40e driver

[pve-kernel-3.10.0.git] / Makefile

diff --git a/Makefile b/Makefile
index 943f0132216ace1a2f29db5ff5be6f11806dcdf8..0d6b83107412fd145719f1071582e80a32015eee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-RELEASE=3.3
+RELEASE=3.4
 
 KERNEL_VER=3.10.0
-PKGREL=25
+PKGREL=28
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=6
+KREL=7
 
-RHKVER=123.13.2.el7
+RHKVER=123.20.1.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -39,6 +39,9 @@ IGBSRC=${IGBDIR}.tar.gz
 IXGBEDIR=ixgbe-3.23.2
 IXGBESRC=${IXGBEDIR}.tar.gz
 
+I40EDIR=i40e-1.2.37
+I40ESRC=${I40EDIR}.tar.gz
+
 BNX2DIR=netxtreme2-7.11.05
 BNX2SRC=${BNX2DIR}.tar.gz
 
@@ -46,6 +49,10 @@ AACRAIDVER=1.2.1-40700
 AACRAIDDIR=aacraid-${AACRAIDVER}.src
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
 
+HPSAVER=3.4.6
+HPSADIR=hpsa-${HPSAVER}
+HPSASRC=${HPSADIR}-170.tar.bz2
+
 # driver does not compile
 #MEGARAID_DIR=megaraid_sas-06.703.11.00
 #MEGARAID_SRC=${MEGARAID_DIR}-src.tar.gz
@@ -113,13 +120,15 @@ fwlist-${KVNAME}: data
        mv fwlist.tmp $@
 
 # fixme: bnx2.ko cnic.ko bnx2x.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko ${SPL_MODULES} ${ZFS_MODULES}
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.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 latest i40e driver
+       install -m 644 i40e.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/i40e/
        # install latest ixgbe driver
        install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
        # install latest e1000e driver
@@ -132,6 +141,8 @@ data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko ixgbe.ko bnx2.ko cnic.ko bnx2
        install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/bnx2x/
        # install aacraid drivers
        install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
+       # install hpsa driver
+       install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
        # install megaraid_sas driver
        # install -m 644 megaraid_sas.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/megaraid/
        ## install Highpoint 2710 RAID driver
@@ -210,6 +221,15 @@ aacraid.ko: .compile_mark ${AACRAIDSRC}
        make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
        cp ${AACRAIDDIR}/aacraid.ko .
 
+hpsa.ko hpsa: .compile_mark ${HPSASRC}
+       rm -rf ${HPSADIR}
+       tar xf ${HPSASRC}
+       sed -i ${HPSADIR}/drivers/scsi/hpsa_kernel_compat.h -e 's/^\/\* #define RHEL7.*/#define RHEL7/'
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi modules
+       cp ${HPSADIR}/drivers/scsi/hpsa.ko hpsa.ko
+
 e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
@@ -234,6 +254,14 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
+i40e.ko i40e: .compile_mark ${I40ESRC}
+       rm -rf ${I40EDIR}
+       tar xf ${I40ESRC}
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       cd ${I40EDIR}/src; make BUILD_KERNEL=${KVNAME}
+       cp ${I40EDIR}/src/i40e.ko i40e.ko
+
 bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
        rm -rf ${BNX2DIR}
        tar xf ${BNX2SRC}
@@ -359,7 +387,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 ${IXGBEDIR} ${E1000EDIR} e1000e.ko ${IGBDIR} igb.ko fwlist-${KVNAME} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES}
+       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} ${BNX2DIR} bnx2.ko cnic.ko bnx2x.ko aacraid.ko ${AACRAIDDIR} rr272x_1x.ko ${RR272XDIR} ${ARECADIR}.ko ${ARECADIR} ${ZFSDIR} ${SPLDIR} ${SPL_MODULES} ${ZFS_MODULES} hpsa.ko ${HPSADIR}