X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=2d6489d9971deb79cad0197cc5ff91c7f5d7a932;hb=4b659c9ce05797db7aec02d2ae268274760786cb;hp=fb44205d95414437c3558cb08a328c2f082c38bd;hpb=5d6c3ffa8ea47673475eacc878a4aeed72226238;p=pve-kernel.git

diff --git a/Makefile b/Makefile
index fb44205..2d6489d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,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=4
 
-PKGREL=13
+PKGREL=23
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -47,9 +49,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 +56,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 +133,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}
@@ -158,7 +151,7 @@ $(ZFSDIR).prepared: ${ZFSSRC}
 
 .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