bump version to 4.15-7, bump ABI to 4.15.17-1-pve

[pve-kernel.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index e5f5ddf16bdb80c7e4008dbd8f05ba28d3e0c15a..6596254d6811c220145af6c615d9b4ce831a1e0c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,16 +5,17 @@
 #export DH_VERBOSE=1
 
 # TODO: check for headers not being installed
+BUILD_DIR=$(shell pwd)
 
 include /usr/share/dpkg/default.mk
+include debian/rules.d/env.mk
 include debian/rules.d/${DEB_BUILD_ARCH}.mk
 
-KVNAME=${DEB_VERSION_UPSTREAM}${EXTRAVERSION}
 CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
 
 PVE_KERNEL_PKG=pve-kernel-${KVNAME}
 PVE_HEADER_PKG=pve-headers-${KVNAME}
-LINUX_TOOLS_PKG=linux-tools-4.13
+LINUX_TOOLS_PKG=linux-tools-4.15
 
 # TODO: split for archs, move to files?
 PVE_CONFIG_OPTS= \
@@ -98,12 +99,13 @@ binary: install
        install -m 644 ${KERNEL_SRC}/System.map debian/${PVE_KERNEL_PKG}/boot/System.map-${KVNAME}
        install -m 644 ${KERNEL_SRC}/${KERNEL_IMAGE_PATH} debian/${PVE_KERNEL_PKG}/boot/${KERNEL_INSTALL_FILE}-${KVNAME}
        ${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
-       ## install latest ibg driver
-       install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
-       # install latest ixgbe driver
-       install -m 644 ${MODULES}/ixgbe.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
-       # install latest e1000e driver
-       install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
+# disabled for now, incompatbile with 4.15
+#      ## install latest ibg driver
+#      install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
+#      # install latest ixgbe driver
+#      install -m 644 ${MODULES}/ixgbe.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/ixgbe/
+#      # install latest e1000e driver
+#      install -m 644 ${MODULES}/e1000e.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/e1000e/
        # install zfs drivers
        install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
        install -m 644 $(addprefix ${MODULES}/,spl.ko splat.ko zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko zpios.ko icp.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
@@ -130,7 +132,7 @@ binary: install
 .tools_install_mark: .tools_compile_mark
        rm -rf debian/${LINUX_TOOLS_PKG}
        mkdir -p debian/${LINUX_TOOLS_PKG}/usr/bin
-       install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_4.13
+       install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_4.15
        touch $@
 
 .headers_install_mark: .compile_mark .modules_compile_mark
@@ -151,7 +153,9 @@ binary: install
        ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
        touch $@
 
-.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko ixgbe.ko e1000e.ko spl.ko zfs.ko)
+# intel out-of-tree drivers disabled for now - incompatible with 4.15
+#.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko ixgbe.ko e1000e.ko spl.ko zfs.ko)
+.modules_compile_mark: $(addprefix ${MODULES}/,spl.ko zfs.ko)
        touch $@
 
 ${MODULES}/spl.ko: .compile_mark
@@ -201,10 +205,10 @@ fwcheck: fwlist-${KVNAME} fwlist-previous
 
 
 abi-${KVNAME}: .compile_mark
-       sed -e 's/^\(.\+\)[[:space:]]\+\(.\+\)[[:space:]]\(.\+\)$$/\3 \2 \1/' debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/Module.symvers | sort > abi-${KVNAME}
+       debian/scripts/abi-generate debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/Module.symvers abi-${KVNAME} ${KVNAME}
 
 .PHONY: abicheck
-abicheck: debian/scripts/abi-check abi-${KVNAME} abi-previous abi-blacklist
-       debian/scripts/abi-check abi-${KVNAME} abi-previous ${SKIPABI}
+abicheck: debian/scripts/abi-check abi-${KVNAME} abi-prev-* abi-blacklist
+       debian/scripts/abi-check abi-${KVNAME} abi-prev-* ${SKIPABI}
 
 .PHONY: clean