bump version to 4.13-39, bump ABI to 4.13.13-6-pve

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index b957f263c9ce0a10a5a7f0435ef923ca9b3e2b07..fefe10485f0949837f5cac95a924705b98caf10c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-RELEASE=5.0
+RELEASE=5.1
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.13.4
-PKGREL=25
+KERNEL_VER=4.13.13
+PKGREL=39
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
-KREL=1
+KREL=6
 
 KERNEL_SRC=ubuntu-artful
 KERNEL_SRC_SUBMODULE=submodules/ubuntu-artful
@@ -31,17 +31,23 @@ export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp -lchangelog.
 
 SKIPABI=0
 
+ifeq    ($(CC), cc)
+GCC=gcc
+else
+GCC=$(CC)
+endif
+
 TOP=$(shell pwd)
 
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
-E1000EDIR=e1000e-3.3.5.10
+E1000EDIR=e1000e-3.3.6
 E1000ESRC=${E1000EDIR}.tar.gz
 
 IGBDIR=igb-5.3.5.10
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-5.2.3
+IXGBEDIR=ixgbe-5.3.3
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
@@ -100,12 +106,13 @@ ${VIRTUAL_HDR_DEB}: proxmox-ve/pve-headers.control
        gzip -n --best pve-headers/data/usr/share/doc/${VIRTUALHDRPACKAGE}/changelog.Debian
        dpkg-deb --build pve-headers/data ${VIRTUAL_HDR_DEB}
 
-check_gcc: 
-ifeq    ($(CC), cc)
-       gcc --version|grep "6\.3" || false
-else
-       $(CC) --version|grep "6\.3" || false
-endif
+check_gcc:
+       $(GCC) --version|grep "6\.3" || false
+       @$(GCC) -Werror -mindirect-branch=thunk-extern -mindirect-branch-register -c -x c /dev/null -o check_gcc.o \
+               || ( rm -f check_gcc.o; \
+                    echo "Please install gcc-6 packages with indirect thunk / RETPOLINE support"; \
+                    false)
+       @rm -f check_gcc.o
 
 ${DST_DEB}: data control.in prerm.in postinst.in postrm.in copyright changelog.Debian | fwcheck abicheck
        mkdir -p data/DEBIAN
@@ -220,7 +227,11 @@ PVE_CONFIG_OPTS= \
 -e CONFIG_MODVERSIONS \
 -d CONFIG_DEFAULT_SECURITY_DAC \
 -e CONFIG_DEFAULT_SECURITY_APPARMOR \
---set-str CONFIG_DEFAULT_SECURITY apparmor
+--set-str CONFIG_DEFAULT_SECURITY apparmor \
+-d CONFIG_UNWINDER_ORC \
+-d CONFIG_UNWINDER_GUESS \
+-e CONFIG_UNWINDER_FRAME_POINTER \
+-e CONFIG_PAGE_TABLE_ISOLATION
 
 .compile_mark: ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
@@ -238,7 +249,6 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodule
        cp -a ${KERNEL_SRC_SUBMODULE} ${KERNEL_SRC}
        cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
        cd ${KERNEL_SRC}; for patch in ../patches/kernel/*.patch; do patch --verbose -p1 < $${patch}; done
-       cd ${KERNEL_SRC}; for patch in ../patches/kernel-cves/*.patch; do patch --verbose -p1 < $${patch}; done
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -264,7 +274,6 @@ ixgbe.ko ixgbe: .compile_mark ${IXGBESRC}
        rm -rf ${IXGBEDIR}
        tar xf ${IXGBESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
-       cd ${IXGBEDIR}; patch -p1 < ../patches/intel/ixgbe/ixgbe_4.13_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