drop intel_idle Atom Cedarview revert

[pve-kernel-jessie.git] / Makefile

diff --git a/Makefile b/Makefile
index 7fa9bc25a646cb487b9ea852f0426462c6150f89..c2b7ec18460856c2c7559bb6ebe7175f980182d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-RELEASE=4.4
+RELEASE=5.0
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.4.40
-PKGREL=82
+KERNEL_VER=4.4.44
+PKGREL=83
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
 
-KERNEL_SRC=ubuntu-xenial
+KERNEL_SRC=ubuntu-zesty
 KERNELSRCTAR=${KERNEL_SRC}.tgz
 
 EXTRAVERSION=-${KREL}-pve
@@ -24,7 +24,7 @@ TOP=$(shell pwd)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
 FW_VER=1.1
-FW_REL=10
+FW_REL=11
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
 E1000EDIR=e1000e-3.3.5
@@ -73,7 +73,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.5-1
+DRBDVER=9.0.6-1
 DRBDDIR=drbd-${DRBDVER}
 DRBDSRC=${DRBDDIR}.tar.gz
 DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
@@ -125,14 +125,14 @@ ${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-63.84 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
+       git clone --single-branch -b Ubuntu-4.10.0-11.13 git://kernel.ubuntu.com/ubuntu/ubuntu-zesty.git ${KERNEL_SRC}
        tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} 
 
 check_gcc: 
 ifeq    ($(CC), cc)
-       gcc --version|grep "4\.9" || false
+       gcc --version|grep "6\.3" || false
 else
-       $(CC) --version|grep "4\.9" || false
+       $(CC) --version|grep "6\.3" || false
 endif
 
 ${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian
@@ -254,19 +254,9 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        #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
-       cd ${KERNEL_SRC}; patch -p1 <../bug-950-tcp-fix-tcp_mark_head_lost-to-check-skb-len-before-f.patch
-       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
-       # 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
-       # IPoIB performance regression fix
-       cd ${KERNEL_SRC}; patch -p1 < ../IB-ipoib-move-back-the-IB-LL-address-into-the-hard-header.patch
        cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
        cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
-       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-6074-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -416,7 +406,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-4.4.13-2-pve fwlist-4.4.16-1-pve fwlist-4.4.21-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-4.4.16-1-pve fwlist-4.4.21-1-pve fwlist-4.4.44-1-pve fwlist-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -438,6 +428,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        ./assemble-firmware.pl fwlist-4.4.13-2-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-4.4.16-1-pve fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-4.4.21-1-pve fwdata/lib/firmware
+       ./assemble-firmware.pl fwlist-4.4.44-1-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