rebase patches on top of Ubuntu-4.15.0-39.42

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 95cb98ea450f102bad389c4d1319ce55aa765617..53442b700102c233cf2cd8b3df15a863553e077c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ KERNEL_MIN=15
 KERNEL_PATCHLEVEL=18
 # increment KREL if the ABI changes (abicheck target in debian/rules)
 # rebuild packages with new KREL and run 'make abiupdate'
-KREL=1
+KREL=7
 
-PKGREL=18
+PKGREL=27
 
 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN)
 KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL)
@@ -145,13 +145,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