use in tree igb and e1000 module for now

the current OOT are not compatible with 5.0 and we want to obsolete
them anyway sooner or later

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 12830d738a1171348f62fea70162b0037a96a3a8..a81a7dca8583d96b301c4c67c85a028f0ea581db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,25 +37,19 @@ endif
 
 BUILD_DIR=build
 
-KERNEL_SRC=ubuntu-bionic
+KERNEL_SRC=ubuntu-disco
 KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
-E1000EDIR=e1000e-3.4.1.1
-E1000ESRC=${E1000EDIR}.tar.gz
-
-IGBDIR=igb-5.3.5.18
-IGBSRC=${IGBDIR}.tar.gz
-
 ZFSONLINUX_SUBMODULE=submodules/zfsonlinux
 SPLDIR=pkg-spl
 ZFSDIR=pkg-zfs
 
 MODULES=modules
-MODULE_DIRS=${E1000EDIR} ${IGBDIR} ${SPLDIR} ${ZFSDIR}
+MODULE_DIRS=${SPLDIR} ${ZFSDIR}
 
 # exported to debian/rules via debian/rules.d/dirs.mk
-DIRS=KERNEL_SRC E1000EDIR IGBDIR SPLDIR ZFSDIR MODULES
+DIRS=KERNEL_SRC SPLDIR ZFSDIR MODULES
 
 DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
 HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
@@ -113,22 +107,6 @@ ${KERNEL_SRC}.prepared: ${KERNEL_SRC_SUBMODULE} | submodule
 ${MODULES}.prepared: $(addsuffix .prepared,${MODULE_DIRS})
        touch $@
 
-${E1000EDIR}.prepared: ${E1000ESRC}
-       rm -rf ${BUILD_DIR}/${MODULES}/${E1000EDIR} $@
-       mkdir -p ${BUILD_DIR}/${MODULES}/${E1000EDIR}
-       tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${E1000EDIR} -xf ${E1000ESRC}
-       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/intel-module-gcc6-compat.patch
-       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.10_max-mtu.patch
-       cd ${BUILD_DIR}/${MODULES}/${E1000EDIR}; patch -p1 < ../../../patches/intel/e1000e/e1000e_4.15-new-timer.patch
-       touch $@
-
-${IGBDIR}.prepared: ${IGBSRC}
-       rm -rf ${BUILD_DIR}/${MODULES}/${IGBDIR} $@
-       mkdir -p ${BUILD_DIR}/${MODULES}/${IGBDIR}
-       tar --strip-components=1 -C ${BUILD_DIR}/${MODULES}/${IGBDIR} -xf ${IGBSRC}
-       cd ${BUILD_DIR}/${MODULES}/${IGBDIR}; patch -p1 < ../../../patches/intel/igb/igb_4.15_mtu.patch
-       touch $@
-
 ${SPLDIR}.prepared: ${ZFSDIR}.prepared
 ${ZFSDIR}.prepared: ${ZFSONLINUX_SUBMODULE}
        rm -rf ${BUILD_DIR}/${MODULES}/${SPLDIR} ${BUILD_DIR}/${MODULES}/${ZFSDIR} ${BUILD_DIR}/${MODULES}/tmp $@

diff --git a/debian/rules b/debian/rules
index e99db8c2720a6735ecef87d78fcb79cacd185f1c..fdf88da8f606c20bdf8c3c2ae2a7141c6aeec2cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -103,10 +103,6 @@ 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 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
@@ -192,7 +188,7 @@ 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 e1000e.ko spl.ko zfs.ko)
+.modules_compile_mark: $(addprefix ${MODULES}/,spl.ko zfs.ko)
        touch $@
 
 ${MODULES}/spl.ko: .compile_mark
@@ -214,14 +210,6 @@ ${MODULES}/zfs.ko: .compile_mark ${MODULES}/spl.ko
        cp ${MODULES}/${ZFSDIR}/module/icp/icp.ko ${MODULES}/
        cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/
 
-${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}/e1000e.ko: .compile_mark
-       ${MAKE} -C ${MODULES}/${E1000EDIR}/src BUILD_KERNEL=${KVNAME} KSRC=${BUILD_DIR}/${KERNEL_SRC}
-       cp ${MODULES}/${E1000EDIR}/src/e1000e.ko ${MODULES}/
-
 fwlist-${KVNAME}: .compile_mark .modules_compile_mark
        debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp
        mv fwlist.tmp $@

diff --git a/e1000e-3.4.1.1.tar.gz b/e1000e-3.4.1.1.tar.gz
deleted file mode 100644 (file)
index e72af72..0000000
Binary files a/e1000e-3.4.1.1.tar.gz and /dev/null differ

diff --git a/igb-5.3.5.18.tar.gz b/igb-5.3.5.18.tar.gz
deleted file mode 100644 (file)
index 9e6f3ce..0000000
Binary files a/igb-5.3.5.18.tar.gz and /dev/null differ