update intel network drivers

[pve-kernel-3.10.0.git] / Makefile

diff --git a/Makefile b/Makefile
index fea04f2ea2ae88d7cb433ae33e03621c48fe2bff..98ce40395d3a93fa13aba38d0df063d03555475b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 RELEASE=4.0
 
 KERNEL_VER=3.10.0
-PKGREL=30
+PKGREL=35
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=8
+KREL=10
 
-RHKVER=229.el7
+RHKVER=229.1.2.el7
 
 KERNELSRCRPM=kernel-${KERNEL_VER}-${RHKVER}.src.rpm
 
@@ -27,19 +27,19 @@ KERNEL_CFG=config-${KERNEL_VER}
 KERNEL_CFG_ORG=${RHKERSRCDIR}/kernel-${KERNEL_VER}-x86_64.config
 
 FW_VER=1.1
-FW_REL=3
+FW_REL=4
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 E1000EDIR=e1000e-3.1.0.2
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.2.15
+IGBDIR=igb-5.2.18
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-3.23.2
+IXGBEDIR=ixgbe-4.0.3
 IXGBESRC=${IXGBEDIR}.tar.gz
 
-I40EDIR=i40e-1.2.37
+I40EDIR=i40e-1.2.38
 I40ESRC=${I40EDIR}.tar.gz
 
 BNX2DIR=netxtreme2-7.11.05
@@ -68,7 +68,7 @@ ARECASRC=${ARECADIR}.zip
 #ISCSITARGETDIR=iscsitarget-1.4.20.2
 #ISCSITARGETSRC=${ISCSITARGETDIR}.tar.gz
 
-ZFSVER=0.6.3-1.2
+ZFSVER=0.6.4
 SPLDIR=spl-spl-${ZFSVER}
 SPLSRC=spl-${ZFSVER}.tar.gz
 ZFSDIR=zfs-zfs-${ZFSVER}
@@ -76,6 +76,12 @@ ZFSSRC=zfs-${ZFSVER}.tar.gz
 ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 SPL_MODULES=spl.ko splat.ko
 
+# DRBD9
+DRBDVER=9.0.0rc2
+DRBDDIR=drbd-${DRBDVER}
+DRBDSRC=${DRBDDIR}.tar.gz
+DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
+
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve-${KERNEL_VER}
@@ -134,7 +140,7 @@ fwlist-${KVNAME}: data
        mv fwlist.tmp $@
 
 # fixme: bnx2.ko cnic.ko bnx2x.ko
-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}
+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} ${DRBD_MODULES}
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -166,6 +172,8 @@ data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic
        # install zfs drivers
        install -d -m 0755 tmp/lib/modules/${KVNAME}/zfs
        install -m 644 ${SPL_MODULES} ${ZFS_MODULES} tmp/lib/modules/${KVNAME}/zfs
+       # install drbd9
+       install -m 644 ${DRBD_MODULES} tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd
        # remove firmware
        rm -rf tmp/lib/firmware
        # strip debug info
@@ -202,6 +210,17 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
        cd ${KERNEL_SRC}; patch -p1 <../override_for_missing_acs_capabilities.patch
        cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
+       # patches from apparmor package
+       cd ${KERNEL_SRC}; patch -p1 <../0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0003-apparmor-Fix-quieting-of-audit-messages-for-network-.patch
+       cd ${KERNEL_SRC}; patch -p1 <../0004-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+       # apparmor update from upstream
+       cd ${KERNEL_SRC}; patch -p1 <../apparmor-01-add-kvzalloc-to-handle-zeroing-for-kvmalloc.patch 
+       cd ${KERNEL_SRC}; patch -p1 <../apparmor-02-fix-fully-qualified-name-parsing.patch 
+       cd ${KERNEL_SRC}; patch -p1 <../apparmor-03-no-need-to-delay-vfree.patch
+       cd ${KERNEL_SRC}; patch -p1 <../apparmor-04-remove-minimum-size-check-for-vmalloc.patch
+       cd ${KERNEL_SRC}; patch -p1 <../apparmor-05-nick-kvfree-from-apparmor.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -316,6 +335,22 @@ ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
        cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
        cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
 
+.PHONY: update-drbd
+update-drbd:
+       rm -rf ${DRBDDIR} ${DRBDSRC} drbd-9.0
+       git clone --recursive git://git.drbd.org/drbd-9.0
+       cd drbd-9.0; make tarball
+       mv drbd-9.0/${DRBDSRC} ${DRBDSRC} 
+
+.PHONY: drbd
+drbd ${DRBD_MODULES}: .compile_mark ${DRBDSRC}
+       rm -rf ${DRBDDIR}
+       tar xzf ${DRBDSRC}
+       mkdir -p /lib/modules/${KVNAME}
+       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
+       cd ${DRBDDIR}; make KVER=${KVNAME}
+       mv ${DRBDDIR}/drbd/drbd.ko drbd.ko
+       mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko
 
 #iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC}
 #      rm -rf ${ISCSITARGETDIR}
@@ -403,7 +438,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} ${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}
+       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} ${DRBDDIR} drbd-9.0