X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=f8b790ee5243f3a1e07490815ffda853e94d3763;hb=812cbfc144833087451f687f8932f8a86c53c474;hp=adaf272717ea82ac92fa7bbd199848a42081d11d;hpb=262ff4236b00540cb131fd58caee9e6f0a8c9f6e;p=pve-kernel.git

diff --git a/Makefile b/Makefile
index adaf272..f8b790e 100644
--- 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.1
-PKGREL=1
+KERNEL_VER=4.13.13
+PKGREL=41
 # 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,25 +31,32 @@ 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
 SPLDIR=pkg-spl
-SPLSRC=submodules/spl-module
+SPLSRC=${ZFSONLINUX_SUBMODULE}/spl-debian
 ZFSDIR=pkg-zfs
-ZFSSRC=submodules/zfs-module
+ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
 ZFS_KO=zfs.ko
-ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko
+ZFS_KO_REST=zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko
 ZFS_MODULES=$(ZFS_KO) $(ZFS_KO_REST)
 SPL_KO=spl.ko
 SPL_KO_REST=splat.ko
@@ -99,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
@@ -219,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)
@@ -232,7 +244,7 @@ PVE_CONFIG_OPTS= \
 	touch $@
 
 ${KERNEL_CFG_ORG}: ${KERNEL_SRC}/README
-${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodules
+${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodule
 	rm -rf ${KERNEL_SRC}
 	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}
@@ -262,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
 
@@ -271,7 +282,7 @@ $(SPL_KO): .compile_mark ${SPLSRC}
 	rm -rf ${SPLDIR}
 	rsync -ra ${SPLSRC}/ ${SPLDIR}
 	[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
-	cd ${SPLDIR}; patch -p1 < ../patches/spl/0001-4.13-compat.patch
+	cd ${SPLDIR}; for patch in ../${SPLSRC}/../spl-patches/*.patch; do patch --verbose -p1 < $${patch}; done
 	cd ${SPLDIR}; ./autogen.sh
 	cd ${SPLDIR}; ./configure --with-config=kernel --with-linux=${TOP}/${KERNEL_SRC} --with-linux-obj=${TOP}/${KERNEL_SRC}
 	cd ${SPLDIR}; make
@@ -283,7 +294,7 @@ $(ZFS_KO): .compile_mark ${ZFSSRC}
 	rm -rf ${ZFSDIR}
 	rsync -ra ${ZFSSRC}/ ${ZFSDIR}
 	[ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
-	cd ${ZFSDIR}; patch -p1 < ../patches/zfs/0001-4.13-compat.patch
+	cd ${ZFSDIR}; for patch in ../${ZFSSRC}/../zfs-patches/*.patch; do patch --verbose -p1 < $${patch}; done
 	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
@@ -293,6 +304,7 @@ $(ZFS_KO): .compile_mark ${ZFSSRC}
 	cp ${ZFSDIR}/module/unicode/zunicode.ko zunicode.ko
 	cp ${ZFSDIR}/module/zcommon/zcommon.ko zcommon.ko
 	cp ${ZFSDIR}/module/zpios/zpios.ko zpios.ko
+	cp ${ZFSDIR}/module/icp/icp.ko icp.ko
 
 headers_tmp := $(CURDIR)/tmp-headers
 headers_dir := $(headers_tmp)/usr/src/linux-headers-${KVNAME}
@@ -334,15 +346,17 @@ distclean: clean
 
 # upgrade to current master
 .PHONY: update_modules
-update_modules: submodules
+update_modules: submodule
 	git submodule foreach 'git pull --ff-only origin master'
+	cd ${ZFSSRC}; git pull --ff-only origin master
+	cd ${SPLSRC}; git pull --ff-only origin master
 
 # make sure submodules were initialized
-.PHONY: submodules
-submodules:
-	test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init
-	test -f "${ZFSSRC}/debian/changelog" || git submodule update --init
-	test -f "${SPLSRC}/debian/changelog" || git submodule update --init
+.PHONY: submodule
+submodule:
+	test -f "${KERNEL_SRC_SUBMODULE}/README" || git submodule update --init ${KERNEL_SRC_SUBMODULE}
+	test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init ${ZFSONLINUX_SUBMODULE}
+	(test -f "${ZFSSRC}/debian/changelog" && test -f "${SPLZRC}/debian/changelog") || (cd ${ZFSONLINUX_SUBMODULE}; git submodule update --init)
 
 
 .PHONY: clean