update e1000e to 3.3.5

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 8f02ce8a76e4b1457eb6cc664dac07215c179123..5e9d434bd88920358fc10a65304ad32ddbab9eb8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 RELEASE=4.2
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.4.13
-PKGREL=55
+KERNEL_VER=4.4.16
+PKGREL=61
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
@@ -26,10 +26,10 @@ FW_VER=1.1
 FW_REL=8
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-E1000EDIR=e1000e-3.3.3
+E1000EDIR=e1000e-3.3.5
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.3.4.4
+IGBDIR=igb-5.3.5.3
 IGBSRC=${IGBDIR}.tar.gz
 
 IXGBEDIR=ixgbe-4.4.6
@@ -72,7 +72,7 @@ ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
 SPL_MODULES=spl.ko splat.ko
 
 # DRBD9
-DRBDVER=9.0.2-1
+DRBDVER=9.0.3-1
 DRBDDIR=drbd-${DRBDVER}
 DRBDSRC=${DRBDDIR}.tar.gz
 DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
@@ -122,7 +122,7 @@ ${VIRTUAL_HDR_DEB} pve-headers: proxmox-ve/pve-headers.control
 download:
        rm -rf ${KERNEL_SRC} ${KERNELSRCTAR}
        #git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
-       git clone --single-branch -b Ubuntu-4.4.0-28.47 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
+       git clone --single-branch -b Ubuntu-4.4.0-36.55 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
        tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} 
 
 check_gcc: 
@@ -202,6 +202,7 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR
        mv tmp data
 
 PVE_CONFIG_OPTS= \
+-m INTEL_MEI_WDT \
 -d CONFIG_SND_PCM_OSS \
 -d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \
 -d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \
@@ -255,6 +256,11 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 < ../981-1-PCI-Reverse-standard-ACS-vs-device-specific-ACS-enabling.patch
        cd ${KERNEL_SRC}; patch -p1 < ../981-2-PCI-Quirk-PCH-root-port-ACS-for-Sunrise-Point.patch
        cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../ie31200_edac-add-skylake-support.patch
+       # avoid iAMT watchdog problems (not a real watchdog, because does not reset the host)
+       cd ${KERNEL_SRC}; patch -p1 < ../watchdog_implement-mei-iamt-driver.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../mei_drop-watchdog-code.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../mei_bus-whitelist-watchdog-client.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -280,6 +286,8 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       # patch used for igb and e1000e!
+       cd ${E1000EDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch
        cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
@@ -287,6 +295,8 @@ igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       # patch used for igb and e1000e!
+       cd ${IGBDIR}; patch -p1 < ../igb_e1000e-kcompat-version-check-fix.patch
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
@@ -400,7 +410,7 @@ dvb-firmware.git/README:
 linux-firmware.git/WHENCE:
        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 dvb-firmware.git/README 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-6-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-3.10.0-7-pve fwlist-3.10.0-8-pve fwlist-3.19.8-1-pve fwlist-4.2.8-1-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README 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-6-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-2.6.32-21-pve fwlist-3.10.0-3-pve fwlist-3.10.0-7-pve fwlist-3.10.0-8-pve fwlist-3.19.8-1-pve fwlist-4.2.8-1-pve fwlist-4.4.13-2-pve fwlist-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -419,6 +429,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        ./assemble-firmware.pl fwlist-3.10.0-8-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-3.19.8-1-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-4.2.8-1-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-4.4.13-2-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