X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=c7d17ab30b7ae1aa2ee356095c6ed6f75297120f;hb=3db86f10842c7284be96e13fe319c99a94e998cb;hp=11f7cfa97ffb4f8e00a310d8ca4a1d1a4bcabbd0;hpb=93a8ca28fc09dd74ef35e513ce7835b6c1188bb2;p=pve-kernel.git

diff --git a/Makefile b/Makefile
index 11f7cfa..c7d17ab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-RELEASE=5.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
+KERNEL_PATCHLEVEL=18
+# increment KREL if the ABI changes (abicheck target in debian/rules)
+# rebuild packages with new KREL and run 'make abiupdate'
+KREL=9
 
-PKGREL=14
+PKGREL=30
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -47,9 +47,6 @@ E1000ESRC=${E1000EDIR}.tar.gz
 IGBDIR=igb-5.3.5.18
 IGBSRC=${IGBDIR}.tar.gz
 
-IXGBEDIR=ixgbe-5.3.7
-IXGBESRC=${IXGBEDIR}.tar.gz
-
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
 SPLDIR=pkg-spl
 SPLSRC=${ZFSONLINUX_SUBMODULE}/spl-debian
@@ -57,10 +54,10 @@ ZFSDIR=pkg-zfs
 ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
 
 MODULES=modules
-MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
+MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR}
 
 # exported to debian/rules via debian/rules.d/dirs.mk
-DIRS=KERNEL_SRC E1000EDIR IGBDIR IXGBEDIR SPLDIR ZFSDIR MODULES
+DIRS=KERNEL_SRC E1000EDIR IGBDIR SPLDIR ZFSDIR MODULES
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
@@ -134,12 +131,6 @@ ${IGBDIR}.prepared: ${IGBSRC}
 	cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
 	touch $@
 
-${IXGBEDIR}.prepared: ${IXGBESRC}
-	rm -rf ${BUILD_DIR}/${MODULES}/${IXGBEDIR} $@
-	mkdir -p ${BUILD_DIR}/${MODULES}/${IXGBEDIR}
-	tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${IXGBEDIR} -xf ${IXGBESRC}
-	touch $@
-
 $(SPLDIR).prepared: ${SPLSRC}
 	rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} $@
 	mkdir -p ${BUILD_DIR}/${MODULES}/${SPLDIR}
@@ -152,13 +143,11 @@ $(ZFSDIR).prepared: ${ZFSSRC}
 	mkdir -p ${BUILD_DIR}/${MODULES}/${ZFSDIR}
 	cp -a ${ZFSSRC}/* ${BUILD_DIR}/${MODULES}/${ZFSDIR}
 	cd ${BUILD_DIR}/${MODULES}/${ZFSDIR}; for patch in ../../../${ZFSSRC}/../zfs-patches/*.patch; do patch -p1 < $${patch}; done
-	# temporarily since patch does not know about permissions, remove after 0.7.7 was merged properly
-	chmod +x ${BUILD_DIR}/${MODULES}/${ZFSDIR}/scripts/enum-extract.pl
 	touch $@
 
 .PHONY: upload
 upload: ${DEBS}
-	tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch ${ARCH}
+	tar cf - ${DEBS}|ssh -X repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch ${ARCH}
 
 .PHONY: distclean
 distclean: clean