X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=faf6567815c95e65f4746c0029d80f7802c8dce0;hb=d529def17e490423bd3cfe9a8d2803711a1be30f;hp=4055d4127172009f29eacc3e47683e664d76b44c;hpb=6f9f5e4f75b031c5301196ebbe063ee7cae11c2c;p=pve-kernel-jessie.git diff --git a/Makefile b/Makefile index 4055d41..faf6567 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ -RELEASE=4.3 +RELEASE=5.0 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL -KERNEL_VER=4.4.21 -PKGREL=68 +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 @@ -17,22 +17,23 @@ 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=10 +FW_REL=11 FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb -E1000EDIR=e1000e-3.3.5 +E1000EDIR=e1000e-3.3.5.3 E1000ESRC=${E1000EDIR}.tar.gz -IGBDIR=igb-5.3.5.3 +IGBDIR=igb-5.3.5.4 IGBSRC=${IGBDIR}.tar.gz -IXGBEDIR=ixgbe-4.4.6 +IXGBEDIR=ixgbe-5.0.4 IXGBESRC=${IXGBEDIR}.tar.gz # does not compile with kernel 3.19.8 @@ -72,10 +73,10 @@ ZFS_MODULES=zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko SPL_MODULES=spl.ko splat.ko # DRBD9 -DRBDVER=9.0.4-1 -DRBDDIR=drbd-${DRBDVER} -DRBDSRC=${DRBDDIR}.tar.gz -DRBD_MODULES=drbd.ko drbd_transport_tcp.ko +#DRBDVER=9.0.6-1 +#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 @@ -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,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-42.62 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 @@ -173,7 +171,7 @@ fwlist-${KVNAME}: data ./find-firmware.pl data/lib/modules/${KVNAME} >fwlist.tmp mv fwlist.tmp $@ -data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DRBD_MODULES} +data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME} mkdir tmp/boot install -m 644 ${KERNEL_SRC}/.config tmp/boot/config-${KVNAME} @@ -192,7 +190,7 @@ data: .compile_mark igb.ko ixgbe.ko e1000e.ko ${SPL_MODULES} ${ZFS_MODULES} ${DR 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 + #install -m 644 ${DRBD_MODULES} tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd # remove firmware rm -rf tmp/lib/firmware # strip debug info @@ -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,22 +248,15 @@ ${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 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 - #sd: Fix rw_max for devices that report an optimal xfer size - cd ${KERNEL_SRC}; patch -p1 < ../sd-fix-rw_max.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 sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' touch $@ @@ -292,8 +282,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}; patch -p1 < ../intel-module-gcc6-compat.patch + cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${E1000EDIR}/src/e1000e.ko e1000e.ko @@ -301,8 +291,9 @@ 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}; patch -p1 < ../intel-module-gcc6-compat.patch + cd ${IGBDIR}; patch -p1 < ../igb_4.9_compat.patch + cd ${IGBDIR}; patch -p1 < ../igb_4.10_compat.patch cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} cp ${IGBDIR}/src/igb.ko igb.ko @@ -310,9 +301,8 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC} rm -rf ${IXGBEDIR} tar xf ${IXGBESRC} [ ! -e /lib/modules/${KVNAME}/build ] || rm /lib/modules/${KVNAME}/build - # HACK: for kernel < 4.6, we need to set UTS_UBUNTU_RELEASE_ABI manually - # to make it compile - cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO -DUTS_UBUNTU_RELEASE_ABI=22" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC} + cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_compat.patch + 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} @@ -359,21 +349,21 @@ ${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} - [ ! -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 +#.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} +# [ ! -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 #iscsi_trgt.ko: .compile_mark ${ISCSITARGETSRC} # rm -rf ${ISCSITARGETDIR} @@ -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