bump version to 4.15-10

[pve-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 71a372b6aad2f3c8951fd46b66842562281adb21..c7fe717f8cc0c3e6a3a49433416ded501d6fbbc3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
 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
-
-export EXTRAVERSION=-${KREL}-pve
+# also update pve-kernel-meta.git if either of these change
+KERNEL_VER=4.15.17
+KREL=2
+
+PKGREL=10
+
+EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
 PACKAGE=pve-kernel-${KVNAME}
 HDRPACKAGE=pve-headers-${KVNAME}
@@ -31,36 +30,38 @@ else
 GCC=$(CC)
 endif
 
-TOP=$(shell pwd)
-# TODO: maybe move exported paths to a sourced file in ${BUILD_DIR}?
-export BUILD_DIR=${TOP}/build
+BUILD_DIR=build
 
-export 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
 
-
-export E1000EDIR=e1000e-3.3.6
+E1000EDIR=e1000e-3.3.6
 E1000ESRC=${E1000EDIR}.tar.gz
 
-export IGBDIR=igb-5.3.5.10
+IGBDIR=igb-5.3.5.10
 IGBSRC=${IGBDIR}.tar.gz
 
-export IXGBEDIR=ixgbe-5.3.3
+IXGBEDIR=ixgbe-5.3.3
 IXGBESRC=${IXGBEDIR}.tar.gz
 
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
-export SPLDIR=pkg-spl
+SPLDIR=pkg-spl
 SPLSRC=${ZFSONLINUX_SUBMODULE}/spl-debian
-export ZFSDIR=pkg-zfs
+ZFSDIR=pkg-zfs
 ZFSSRC=${ZFSONLINUX_SUBMODULE}/zfs-debian
 
-export MODULES=modules
-MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${IXGBEDIR} ${SPLDIR} ${ZFSDIR}
+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}
+
+# 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}
 
@@ -77,26 +78,31 @@ check_gcc:
 
 ${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB}
 ${DST_DEB}: ${BUILD_DIR}.prepared
-       cd ${BUILD_DIR}; debian/rules debian/control
        cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us
        lintian ${DST_DEB}
        #lintian ${HDR_DEB}
        lintian ${LINUX_TOOLS_DEB}
 
-${BUILD_DIR}.prepared: $(addsuffix .prepared,${KERNEL_SRC} ${MODULES}) debian
-       rm -rf ${BUILD_DIR}/debian
-       cp -a debian ${BUILD_DIR}/debian
+${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 $@
+
+debian.prepared: debian
+       rm -rf ${BUILD_DIR}/debian
+       mkdir -p ${BUILD_DIR}
+       cp -a debian ${BUILD_DIR}/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
+       cd ${BUILD_DIR}; debian/rules debian/control
        touch $@
 
 ${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
@@ -142,11 +148,13 @@ $(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 --dist stretch --arch ${ARCH}
+       tar cf - ${DEBS}|ssh repoman@repo.proxmox.com -- upload --product pve,pmg --dist stretch --arch ${ARCH}
 
 .PHONY: distclean
 distclean: clean
@@ -166,11 +174,26 @@ submodule:
        test -f "${ZFSONLINUX_SUBMODULE}/Makefile" || git submodule update --init ${ZFSONLINUX_SUBMODULE}
        (test -f "${ZFSSRC}/debian/changelog" && test -f "${SPLZRC}/debian/changelog") || (cd ${ZFSONLINUX_SUBMODULE}; git submodule update --init)
 
+# call after ABI bump with header deb in working directory
+.PHONY: abiupdate
+abiupdate: abi-prev-${KVNAME}
+abi-prev-${KVNAME}: abi-tmp-${KVNAME}
+ifneq ($(strip $(shell git status --untracked-files=no --porcelain -z)),)
+       @echo "working directory unclean, aborting!"
+       @false
+else
+       git rm "abi-prev-*"
+       mv $< $@
+       git add $@
+       git commit -s -m "update ABI file for ${KVNAME}" -m "(generated with debian/scripts/abi-generate)"
+       @echo "update abi-prev-${KVNAME} committed!"
+endif
+
+abi-tmp-${KVNAME}:
+       @ test -e ${HDR_DEB} || (echo "need ${HDR_DEB} to extract ABI data!" && false)
+       debian/scripts/abi-generate ${HDR_DEB} $@ ${KVNAME} 1
 
 .PHONY: clean
 clean:
        rm -rf *~ build *.prepared ${KERNEL_CFG_ORG}
-
-
-
-
+       rm -f *.deb *.changes *.buildinfo