X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=cb675997e1fedafdc6bb91bef65b76cd0a65a7d6;hb=faa3d7515d360f3addfb86bbd08faa2c0ab3c670;hp=495ca4a232d07e0eedc83e15ca621ae60b96eaa4;hpb=66aed5b89f9896b0975c48f53fe5ec6b66408641;p=pve-kernel.git

diff --git a/Makefile b/Makefile
index 495ca4a..cb67599 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 RELEASE=5.1
 
-# also update proxmox-ve/changelog if you change KERNEL_VER or KREL
-KERNEL_VER=4.13.13
-PKGREL=41
-# also include firmware of previous version into
-# the fw package:  fwlist-2.6.32-PREV-pve
-KREL=6
+# also update pve-kernel-meta.git if either of these change
+KERNEL_VER=4.15.3
+KREL=1
+
+PKGREL=1
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
@@ -33,8 +32,8 @@ endif
 
 BUILD_DIR=build
 
-KERNEL_SRC=ubuntu-artful
-KERNEL_SRC_SUBMODULE=submodules/ubuntu-artful
+KERNEL_SRC=ubuntu-bionic
+KERNEL_SRC_SUBMODULE=submodules/ubuntu-bionic
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
 E1000EDIR=e1000e-3.3.6
@@ -53,14 +52,16 @@ ZFSDIR=pkg-zfs
 ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
 
 MODULES=modules
-MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
+#intel out-of-tree drivers disabled for now - incompatible with 4.15
+#MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
+MODULE_DIRS=${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.13_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
+LINUX_TOOLS_DEB=linux-tools-4.15_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 
 DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}
 
@@ -84,7 +85,7 @@ ${DST_DEB}: ${BUILD_DIR}.prepared
 
 ${BUILD_DIR}.prepared: $(addsuffix .prepared,${KERNEL_SRC} ${MODULES} debian)
 	cp -a fwlist-previous ${BUILD_DIR}/
-	cp -a abi-previous ${BUILD_DIR}/
+	cp -a abi-prev-* ${BUILD_DIR}/
 	cp -a abi-blacklist ${BUILD_DIR}/
 	touch $@
 
@@ -101,8 +102,7 @@ debian.prepared: debian
 ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
 	rm -rf ${BUILD_DIR}/${KERNEL_SRC} $@
 	mkdir -p ${BUILD_DIR}
-	mkdir ${BUILD_DIR}/${KERNEL_SRC}
-	cp -a ${KERNEL_SRC_SUBMODULE}/* ${BUILD_DIR}/${KERNEL_SRC}/
+	cp -a ${KERNEL_SRC_SUBMODULE} ${BUILD_DIR}/${KERNEL_SRC}
 # TODO: split for archs, track and diff in our repository?
 	cat ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.common.${ARCH} ${BUILD_DIR}/${KERNEL_SRC}/debian.master/config/${ARCH}/config.flavour.generic > ${KERNEL_CFG_ORG}
 	cp ${KERNEL_CFG_ORG} ${BUILD_DIR}/${KERNEL_SRC}/.config