]> git.proxmox.com Git - pve-kernel-jessie.git/blobdiff - Makefile
projects / pve-kernel-jessie.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
By default disable the new dynamic halt polling behavior
[pve-kernel-jessie.git] / Makefile
diff --git a/Makefile b/Makefile
index 68cc345aedcc267f24234591bdc46107e43ffbe8..7fb83d5215a890f8b0f78dda5bcda3bdefb87001 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
-RELEASE=4.1
+RELEASE=4.2
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.2.6
-PKGREL=29
+KERNEL_VER=4.4.8
+PKGREL=50
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
 
-KERNEL_SRC=ubuntu-wily
+KERNEL_SRC=ubuntu-xenial
 KERNELSRCTAR=${KERNEL_SRC}.tgz
 
 EXTRAVERSION=-${KREL}-pve
@@ -23,17 +23,16 @@ TOP=$(shell pwd)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
 FW_VER=1.1
-FW_REL=7
+FW_REL=8
 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
 
-# does not compile with kernel 3.19.8
-E1000EDIR=e1000e-3.2.7.1
+E1000EDIR=e1000e-3.3.3
 E1000ESRC=${E1000EDIR}.tar.gz
 
-#IGBDIR=igb-5.3.3.2
-#IGBSRC=${IGBDIR}.tar.gz
+IGBDIR=igb-5.3.4.4
+IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-4.1.5
+IXGBEDIR=ixgbe-4.3.15
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 # does not compile with kernel 3.19.8
@@ -73,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.0
+DRBDVER=9.0.2-1
 DRBDDIR=drbd-${DRBDVER}
 DRBDSRC=${DRBDDIR}.tar.gz
 DRBD_MODULES=drbd.ko drbd_transport_tcp.ko
@@ -83,7 +82,7 @@ HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 PVEPKG=proxmox-ve
 PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
 
-LINUX_TOOLS_PKG=linux-tools-4.2
+LINUX_TOOLS_PKG=linux-tools-4.4
 LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb
 
 all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB} ${PVE_DEB} ${LINUX_TOOLS_DEB}
@@ -94,7 +93,9 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
        install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG}
        sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
-       install -m 0755 proxmox-ve/postinst proxmox-ve/data/DEBIAN/postinst
+       sed -e 's/@KVNAME@/${KVNAME}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
+       chmod 0755 proxmox-ve/data/DEBIAN/postinst
+       install -m 0755 proxmox-ve/postrm proxmox-ve/data/DEBIAN/postrm
        echo "git clone git://git.proxmox.com/git/pve-kernel-4.0.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
        install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${PVEPKG}
        install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${PVEPKG}
@@ -102,12 +103,11 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
 # see https://wiki.ubuntu.com/Kernel/Dev/KernelGitGuide
-# changelog: https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/wily/log/
 .PHONY: download
 download:
        rm -rf ${KERNEL_SRC} ${KERNELSRCTAR}
        #git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
-       git clone git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/wily ${KERNEL_SRC}
+       git clone --single-branch -b Ubuntu-4.4.0-22.39 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC}
        tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} 
 
 check_gcc: 
@@ -144,8 +144,8 @@ ${LINUX_TOOLS_DEB}: .compile_mark control.tools changelog.Debian copyright
        echo 9 > linux-tools/debian/compat
        cp changelog.Debian linux-tools/debian/changelog
        cp copyright linux-tools/debian
-       mkdir -p linux-tools/debian/linux-tools-4.2/usr/bin
-       install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.2/usr/bin/perf_4.2
+       mkdir -p linux-tools/debian/linux-tools-4.4/usr/bin
+       install -m 0755 ${KERNEL_SRC}/tools/perf/perf linux-tools/debian/linux-tools-4.4/usr/bin/perf_4.4
        cd linux-tools; for i in ${LINUX_TOOLS_DH_LIST}; do dh_$$i; done
        lintian ${LINUX_TOOLS_DEB}
 
@@ -153,7 +153,7 @@ fwlist-${KVNAME}: data
        ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp
        mv fwlist.tmp $@
 
-data: .compile_mark ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
+data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES}
        rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
        mkdir tmp/boot
        install -m 644 ${KERNEL_SRC}/.config tmp/boot/config-${KVNAME}
@@ -161,7 +161,7 @@ data: .compile_mark ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODU
        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 ibg driver
-       #install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
+       install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
        # install latest ixgbe driver
        install -m 644 ixgbe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
        # install latest e1000e driver
@@ -178,7 +178,7 @@ data: .compile_mark ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODU
        # strip debug info
        find tmp/lib/modules -name \*.ko -print | while read f ; do strip --strip-debug "$$f"; done
        # finalize
-       depmod -b tmp/ ${KVNAME}
+       /sbin/depmod -b tmp/ ${KVNAME}
        # Autogenerate blacklist for watchdog devices (see README)
        install -m 0755 -d tmp/lib/modprobe.d
        ls tmp/lib/modules/${KVNAME}/kernel/drivers/watchdog/ > watchdog-blacklist.tmp
@@ -203,6 +203,7 @@ PVE_CONFIG_OPTS= \
 -e CONFIG_BLK_DEV_SD \
 -e CONFIG_BLK_DEV_SR \
 -e CONFIG_BLK_DEV_DM \
+-e CONFIG_BLK_DEV_NVME \
 -d CONFIG_INPUT_EVBUG \
 -d CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND \
 -e CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE \
@@ -233,27 +234,15 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #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 <../override_for_missing_acs_capabilities.patch
        #cd ${KERNEL_SRC}; patch -p1 <../vhost-net-extend-device-allocation-to-vmalloc.patch
-       cd ${KERNEL_SRC}; patch -p1 <../kvmstealtime.patch
-       cd ${KERNEL_SRC}; patch -p1 <../kvm-x86-obey-KVM_X86_QUIRK_CD_NW_CLEARED-in-kvm_set_cr0.patch
-       cd ${KERNEL_SRC}; patch -p1 <../KVM-svm-unconditionally-intercept-DB.patch
-       cd ${KERNEL_SRC}; patch -p1 <../apparmor-socket-mediation.patch
-       # backport aacraid update from kernel 4.4rc5
-       cd ${KERNEL_SRC}; patch -p1 <../0001-aacraid-fix-for-LD.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0002-aacraid-add-power-management.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0003-aacraid-change-interrupt-mode.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0004-aacraid-enable-64bit-write.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0005-aacraid-tune-response-path.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0006-aacraid-reset-irq-affinity.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0007-aacraid-ioctl-fix.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0008-aacraid-use-pci-enable-msix-range.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0009-aacraid-update-driver-version.patch
-       # backport MTTR kvm fixed (pci passthrough bug) from kernel 4.4rc7
-       cd ${KERNEL_SRC}; patch -p1 <../0001-mttr.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0002-mttr.patch
-       cd ${KERNEL_SRC}; patch -p1 <../0003-mttr.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 < ../CVE-2016-4485-net-fix-infoleak-in-llc.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4486-net-fix-infoleak-in-rtnetlink.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../CVE-2016-4558-bpf-fix-refcnt-overflow.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -263,67 +252,59 @@ aacraid.ko: .compile_mark ${AACRAIDSRC}
        cd ${AACRAIDDIR};tar xzf ../${AACRAIDSRC}
        cd ${AACRAIDDIR};rpm2cpio aacraid-${AACRAIDVER}.src.rpm|cpio -i
        cd ${AACRAIDDIR};tar xf aacraid_source.tgz
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} modules
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${AACRAIDDIR} KSRC=${TOP}/${KERNEL_SRC} 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
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       make -C ${TOP}/${KERNEL_SRC} M=${TOP}/${HPSADIR}/drivers/scsi KSRC=${TOP}/${KERNEL_SRC} modules
        cp ${HPSADIR}/drivers/scsi/hpsa.ko hpsa.ko
 
 e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME}
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
 igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME}
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
 ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME}
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        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}
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${I40EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${I40EDIR}/src/i40e.ko i40e.ko
 
 bnx2.ko cnic.ko bnx2x.ko: ${BNX2SRC}
        rm -rf ${BNX2DIR}
        tar xf ${BNX2SRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME}
-       cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME}
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${BNX2DIR}; make -C bnx2/src KVER=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
+       cd ${BNX2DIR}; make -C bnx2x/src KVER=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp `find ${BNX2DIR} -name bnx2.ko -o -name cnic.ko -o -name bnx2x.ko` .
 
 arcmsr.ko: .compile_mark ${ARECASRC}
        rm -rf ${ARECADIR}
        mkdir ${ARECADIR}; cd ${ARECADIR}; unzip ../${ARECASRC}
-       mkdir -p /lib/modules/${KVNAME}
-       ln -sf ${TOP}/${KERNEL_SRC} /lib/modules/${KVNAME}/build
-       cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} modules
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${ARECADIR}; make -C ${TOP}/${KERNEL_SRC} SUBDIRS=${TOP}/${ARECADIR} KSRC=${TOP}/${KERNEL_SRC} modules
        cp ${ARECADIR}/arcmsr.ko arcmsr.ko
 
 ${SPL_MODULES}: .compile_mark ${SPLSRC}
@@ -338,6 +319,7 @@ ${SPL_MODULES}: .compile_mark ${SPLSRC}
 ${ZFS_MODULES}: .compile_mark ${ZFSSRC}
        rm -rf ${ZFSDIR}
        tar xf ${ZFSSRC}
+       cd ${ZFSDIR}; patch -p1 < ../zfs-fix-default-acl.patch
        cd ${ZFSDIR}; ./autogen.sh
        cd ${ZFSDIR}; ./configure --with-spl=${TOP}/${SPLDIR} --with-spl-obj=${TOP}/${SPLDIR} --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
        cd ${ZFSDIR}; make
@@ -359,9 +341,8 @@ update-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}
+       [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build
+       cd ${DRBDDIR}; make KVER=${KVNAME} KDIR=${TOP}/${KERNEL_SRC}
        mv ${DRBDDIR}/drbd/drbd.ko drbd.ko
        mv ${DRBDDIR}/drbd/drbd_transport_tcp.ko drbd_transport_tcp.ko
 
@@ -404,7 +385,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-${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-${KVNAME}
        rm -rf fwdata
        mkdir -p fwdata/lib/firmware
        ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
@@ -422,6 +403,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README
        ./assemble-firmware.pl fwlist-3.10.0-7-pve fwdata/lib/firmware
        ./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
        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
Linux Kernel for Jessie