buildsys: print out which patch we apply

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index ee4eaffa74ca7f21236b76375d457ab0856b1748..fb44205d95414437c3558cb08a328c2f082c38bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,15 @@
 RELEASE=5.1
 
-# also update pve-kernel-meta.git if either of these change
-KERNEL_VER=4.15.17
-KREL=1
+# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
+KERNEL_MAJ=4
+KERNEL_MIN=15
+KERNEL_PATCHLEVEL=17
+KREL=3
 
-PKGREL=9
+PKGREL=13
+
+KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
+KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
@@ -33,16 +38,16 @@ endif
 BUILD_DIR=build
 
 KERNEL_SRC=ubuntu-bionic
-KERNEL_SRC_SUBMODULE=submodules/ubuntu-bionic
+KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
-E1000EDIR=e1000e-3.3.6
+E1000EDIR=e1000e-3.4.1.1
 E1000ESRC=${E1000EDIR}.tar.gz
 
-IGBDIR=igb-5.3.5.10
+IGBDIR=igb-5.3.5.18
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-5.3.3
+IXGBEDIR=ixgbe-5.3.7
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
@@ -52,16 +57,14 @@ ZFSDIR=pkg-zfs
 ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
 
 MODULES=modules
-#intel out-of-tree drivers disabled for now - incompatible with 4.15
-#MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
-MODULE_DIRS=${SPLDIR} ${ZFSDIR}
+MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
 
 # exported to debian/rules via debian/rules.d/dirs.mk
 DIRS=KERNEL_SRC E1000EDIR IGBDIR IXGBEDIR SPLDIR ZFSDIR MODULES
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
-LINUX_TOOLS_DEB=linux-tools-4.15_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}
 
@@ -96,6 +99,7 @@ debian.prepared: debian
        echo "git clone git://git.proxmox.com/git/pve-kernel.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE
        @$(foreach dir, ${DIRS},echo "${dir}=${${dir}}" >> ${BUILD_DIR}/debian/rules.d/env.mk;)
        echo "KVNAME=${KVNAME}" >> ${BUILD_DIR}/debian/rules.d/env.mk
+       echo "KERNEL_MAJMIN=${KERNEL_MAJMIN}" >> ${BUILD_DIR}/debian/rules.d/env.mk
        cd ${BUILD_DIR}; debian/rules debian/control
        touch $@
 
@@ -108,7 +112,7 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
        cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config
        sed -i ${BUILD_DIR}/${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        rm -rf ${BUILD_DIR}/${KERNEL_SRC}/debian ${BUILD_DIR}/${KERNEL_SRC}/debian.master
-       cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do patch -p1 < $${patch}; done
+       cd ${BUILD_DIR}/${KERNEL_SRC}; for patch in ../../patches/kernel/*.patch; do echo "applying patch '$$patch'" && patch -p1 < $${patch}; done
        touch $@
 
 ${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
@@ -120,14 +124,14 @@ ${E1000EDIR}.prepared: ${E1000ESRC}
        tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${E1000EDIR} -xf ${E1000ESRC}
        cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/intel-module-gcc6-compat.patch
        cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.10_max-mtu.patch
+       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.15-new-timer.patch
        touch $@
 
 ${IGBDIR}.prepared: ${IGBSRC}
        rm -rf ${BUILD_DIR}/${MODULES}/${IGBDIR} $@
        mkdir -p ${BUILD_DIR}/${MODULES}/${IGBDIR}
        tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${IGBDIR} -xf ${IGBSRC}
-       cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.10_max-mtu.patch
-       cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.12_compat.patch
+       cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
        touch $@
 
 ${IXGBEDIR}.prepared: ${IXGBESRC}
@@ -196,3 +200,4 @@ abi-tmp-${KVNAME}:
 .PHONY: clean
 clean:
        rm -rf *~ build *.prepared ${KERNEL_CFG_ORG}
+       rm -f *.deb *.changes *.buildinfo