Update sources to Ubuntu-4.15.0-44.47

[pve-kernel.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index ad21471a5df3a40cb108934e9f938df0b00d3ce5..e99db8c2720a6735ecef87d78fcb79cacd185f1c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ debian/control: $(wildcard debian/*.in)
        chmod +x debian/${PVE_KERNEL_PKG}.postrm
        chmod +x debian/${PVE_KERNEL_PKG}.postinst
        chmod +x debian/${PVE_HEADER_PKG}.postinst
-       sed -e 's/@KVNAME@/${KVNAME}/g' < debian/control.in > debian/control
+       sed -e 's/@KVNAME@/${KVNAME}/g' -e 's/@KVMAJMIN@/${KERNEL_MAJMIN}/g' < debian/control.in > debian/control
 
 build: .compile_mark .tools_compile_mark .modules_compile_mark
 
@@ -103,13 +103,10 @@ 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
-# 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 latest ibg driver
+       install -m 644 ${MODULES}/igb.ko debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
+       # 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
@@ -195,9 +192,7 @@ binary: install
        ln -sf /usr/src/linux-headers-${KVNAME} debian/${PVE_HEADER_PKG}/lib/modules/${KVNAME}/build
        touch $@
 
-# 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)
+.modules_compile_mark: $(addprefix ${MODULES}/,igb.ko e1000e.ko spl.ko zfs.ko)
        touch $@
 
 ${MODULES}/spl.ko: .compile_mark
@@ -223,10 +218,6 @@ ${MODULES}/igb.ko: .compile_mark
        ${MAKE} -C ${MODULES}/${IGBDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
        cp ${MODULES}/${IGBDIR}/src/igb.ko ${MODULES}/
 
-${MODULES}/ixgbe.ko: .compile_mark
-       ${MAKE} -C ${MODULES}/${IXGBEDIR}/src CFLAGS_EXTRA="-DIXGBE_NO_LRO" BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
-       cp ${MODULES}/${IXGBEDIR}/src/ixgbe.ko ${MODULES}/
-
 ${MODULES}/e1000e.ko: .compile_mark
        ${MAKE} -C ${MODULES}/${E1000EDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
        cp ${MODULES}/${E1000EDIR}/src/e1000e.ko ${MODULES}/