X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=e7edb769eb2db38cbe3f13a22e124970c20b31d4;hb=9eeead76333efe9ff40d3911a4ca9abe50aef54c;hp=97eb4a2a80284bd498239704f599c151e192db97;hpb=0a68bd5dc062b6d5660388839469e673504faebb;p=pve-kernel-jessie.git diff --git a/Makefile b/Makefile index 97eb4a2..e7edb76 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -RELEASE=4.2 +RELEASE=4.4 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL -KERNEL_VER=4.4.16 -PKGREL=64 +KERNEL_VER=4.4.40 +PKGREL=80 # also include firmware of previous version into # the fw package: fwlist-2.6.32-PREV-pve KREL=1 @@ -17,13 +17,14 @@ HDRPACKAGE=pve-headers-${KVNAME} ARCH=amd64 GITVERSION:=$(shell cat .git/refs/heads/master) +CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate -lchangelog.Debian) TOP=$(shell pwd) KERNEL_CFG_ORG=config-${KERNEL_VER}.org FW_VER=1.1 -FW_REL=9 +FW_REL=10 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb E1000EDIR=e1000e-3.3.5 @@ -72,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.3-1 +DRBDVER=9.0.5-1 DRBDDIR=drbd-${DRBDVER} DRBDSRC=${DRBDDIR}.tar.gz DRBD_MODULES=drbd.ko drbd_transport_tcp.ko @@ -89,10 +90,6 @@ LINUX_TOOLS_DEB=${LINUX_TOOLS_PKG}_${KERNEL_VER}-${PKGREL}_amd64.deb DEBS=${DST_DEB} ${HDR_DEB} ${FW_DEB} ${PVE_DEB} ${VIRTUAL_HDR_DEB} ${LINUX_TOOLS_DEB} -PVE_RELEASE_KEYS= \ - proxmox-ve/proxmox-release-4.x.pubkey \ - proxmox-ve/proxmox-release-5.x.pubkey - all: check_gcc ${DEBS} ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS} @@ -100,7 +97,8 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst ${PVE_RELEASE_KEYS} mkdir -p proxmox-ve/data/DEBIAN mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/ mkdir -p proxmox-ve/data/etc/apt/trusted.gpg.d - gpg2 --no-default-keyring --keyring ./proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve.gpg --import ${PVE_RELEASE_KEYS} + install -m 0644 proxmox-ve/proxmox-release-4.x.pubkey proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve-release-4.x.gpg + install -m 0644 proxmox-ve/proxmox-release-5.x.pubkey proxmox-ve/data/etc/apt/trusted.gpg.d/proxmox-ve-release-5.x.gpg sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' proxmox-ve/data/DEBIAN/control sed -e 's/@KVNAME@/${KVNAME}/' proxmox-ve/data/DEBIAN/postinst chmod 0755 proxmox-ve/data/DEBIAN/postinst @@ -127,7 +125,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-36.55 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC} + git clone --single-branch -b Ubuntu-4.4.0-62.83 git://kernel.ubuntu.com/ubuntu/ubuntu-xenial.git ${KERNEL_SRC} tar czf ${KERNELSRCTAR} --exclude .git ${KERNEL_SRC} check_gcc: @@ -209,9 +207,8 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR PVE_CONFIG_OPTS= \ -m INTEL_MEI_WDT \ -d CONFIG_SND_PCM_OSS \ --d CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \ +-e CONFIG_TRANSPARENT_HUGEPAGE_MADVISE \ -d CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS \ --e CONFIG_TRANSPARENT_HUGEPAGE_NEVER \ -m CONFIG_CEPH_FS \ -m CONFIG_BLK_DEV_NBD \ -m CONFIG_BLK_DEV_RBD \ @@ -242,8 +239,8 @@ PVE_CONFIG_OPTS= \ cp ${KERNEL_CFG_ORG} ${KERNEL_SRC}/.config cd ${KERNEL_SRC}; ./scripts/config ${PVE_CONFIG_OPTS} cd ${KERNEL_SRC}; make oldconfig - cd ${KERNEL_SRC}; make -j 8 - make -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_CPLUS_DEMANGLE=1 NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7 + cd ${KERNEL_SRC}; make KBUILD_BUILD_VERSION_TIMESTAMP="PVE ${KERNEL_VER}-${PKGREL} ($(CHANGELOG_DATE))" -j 8 + make -C ${KERNEL_SRC}/tools/perf prefix=/usr HAVE_CPLUS_DEMANGLE=1 NO_LIBPYTHON=1 NO_LIBPERL=1 NO_LIBCRYPTO=1 PYTHON=python2.7 make -C ${KERNEL_SRC}/tools/perf man touch $@ @@ -251,7 +248,7 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR} rm -rf ${KERNEL_SRC} tar xf ${KERNELSRCTAR} cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG} - cd ${KERNEL_SRC}; patch -p1 <../add-thp-never-option.patch + cd ${KERNEL_SRC}; patch -p1 < ../uname-version-timestamp.patch 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 @@ -261,13 +258,17 @@ ${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 - #sd: Fix rw_max for devices that report an optimal xfer size - cd ${KERNEL_SRC}; patch -p1 < ../sd-fix-rw_max.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 < ../0001-Revert-mm-throttle-on-IO-only-when-there-are-too-man.patch + cd ${KERNEL_SRC}; patch -p1 < ../0002-Revert-mm-oom-rework-oom-detection.patch + cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2583-KVM-x86-fix-emulation-of-MOV-SS-null-selector.patch + cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' touch $@ @@ -417,7 +418,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-${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-${KVNAME} rm -rf fwdata mkdir -p fwdata/lib/firmware ./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware @@ -438,6 +439,7 @@ ${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README ./assemble-firmware.pl fwlist-4.2.8-1-pve fwdata/lib/firmware ./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 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