]> git.proxmox.com Git - pve-kernel.git/blobdiff - Makefile
projects / pve-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
bump version to 4.13-34, bump ABI to 4.13.13-3-pve
[pve-kernel.git] / Makefile
diff --git a/Makefile b/Makefile
index 40343f39156393d357848ad49d57202cc9afbe0e..8cab915694b74e39ee511ea45ad8e27c9985a4c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=5.0
+RELEASE=5.1
 
 # also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.10.17
-PKGREL=23
+KERNEL_VER=4.13.13
+PKGREL=34
 # also include firmware of previous version into
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=3
@@ -35,21 +35,22 @@ TOP=$(shell pwd)
 
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
-E1000EDIR=e1000e-3.3.5.3
+E1000EDIR=e1000e-3.3.6
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.3.5.4
+IGBDIR=igb-5.3.5.10
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-5.0.4
+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
@@ -219,7 +220,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,17 +237,11 @@ 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}
-       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 < ../kvm-dynamic-halt-polling-disable-default.patch
+       cd ${KERNEL_SRC}; for patch in ../patches/kernel/*.patch; do patch --verbose -p1 < $${patch}; done
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
@@ -250,9 +249,8 @@ e1000e.ko e1000e: .compile_mark ${E1000ESRC}
        rm -rf ${E1000EDIR}
        tar xf ${E1000ESRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
-       cd ${E1000EDIR}; patch -p1 < ../intel-module-gcc6-compat.patch
-       cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_compat.patch
-       cd ${E1000EDIR}; patch -p1 < ../e1000e_4.10_max-mtu.patch
+       cd ${E1000EDIR}; patch -p1 < ../patches/intel/intel-module-gcc6-compat.patch
+       cd ${E1000EDIR}; patch -p1 < ../patches/intel/e1000e/e1000e_4.10_max-mtu.patch
        cd ${E1000EDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${E1000EDIR}/src/e1000e.ko e1000e.ko
 
@@ -260,10 +258,8 @@ igb.ko igb: .compile_mark ${IGBSRC}
        rm -rf ${IGBDIR}
        tar xf ${IGBSRC}
        [ ! -e /lib/modules/${KVNAME}/build ] || (echo "please remove /lib/modules/${KVNAME}/build" && false)
-       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}; patch -p1 < ../igb_4.10_max-mtu.patch
+       cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.10_max-mtu.patch
+       cd ${IGBDIR}; patch -p1 < ../patches/intel/igb/igb_4.12_compat.patch
        cd ${IGBDIR}/src; make BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IGBDIR}/src/igb.ko igb.ko
 
@@ -271,8 +267,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 < ../ixgbe_4.10_compat.patch
-       cd ${IXGBEDIR}; patch -p1 < ../ixgbe_4.10_max-mtu.patch
        cd ${IXGBEDIR}/src; make CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${TOP}/${KERNEL_SRC}
        cp ${IXGBEDIR}/src/ixgbe.ko ixgbe.ko
 
@@ -281,6 +275,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}; 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
@@ -292,6 +287,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}; 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
@@ -301,6 +297,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}
@@ -342,15 +339,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
Linux Kernel for Proxmox projects