From b1f11d71cb2e0483225572ae2703d6634a04933e Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 15 May 2020 10:50:20 +0800 Subject: ixgbevf: upgrade 4.6.3 -> 4.7.1 Use modules_install target and remove the depmod patch that shouldn't be required now. Signed-off-by: Anuj Mittal --- .../ixgbevf/0001-ixgbevf-skip-host-depmod.patch | 31 -------------- recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb | 47 ---------------------- recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb | 42 +++++++++++++++++++ 3 files changed, 42 insertions(+), 78 deletions(-) delete mode 100644 recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch delete mode 100644 recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb create mode 100644 recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch deleted file mode 100644 index 656a897d..00000000 --- a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9677d09f5c3984997ac8e7d90b5d4b11fb9ce277 Mon Sep 17 00:00:00 2001 -From: sweeaun -Date: Sat, 7 Oct 2017 20:56:35 -0700 -Subject: [PATCH] ixgbevf: skip host depmod - -Upstream-Status: Inappropriate [Cross-Compile] - -Depmod during do_install is irrelevant when cross-compiling. -Remove the depmod steps during do_install. - -Signed-off-by: sweeaun ---- - Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 91df705..1dcf350 100644 ---- a/Makefile -+++ b/Makefile -@@ -104,8 +104,6 @@ modules_install: default manfile - @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz - @echo "Installing modules..." - @+$(call kernelbuild,modules_install) -- @echo "Running depmod..." -- @$(call cmd_depmod) - - uninstall: - rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko; --- -2.7.4 - diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb deleted file mode 100644 index 0b3b461e..00000000 --- a/recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY="ixgbevf kernel driver for Intel Magnolia Park 10GbE" -DESCRIPTION="This virtual function driver supports kernel versions 2.6.x and newer \ -This driver supports 82599, X540, X550, and X552-based virtual function devices \ -that can only be activated on kernels that support SR-IOV. \ -SR-IOV requires the correct platform and OS support. \ -The guest OS loading this driver must support MSI-X interrupts." - -HOMEPAGE = "https://sourceforge.net/projects/e1000/" -SECTION = "kernel/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" - -SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ - file://0001-ixgbevf-skip-host-depmod.patch \ - " - -SRC_URI[md5sum] = "9258960e4d005c7da546cb8dca7bedc5" -SRC_URI[sha256sum] = "740bb4822c54e5f9bc6a6e73ec562058cb9a27264d727453011c3725d3dd9ad2" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" -UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P\d+(\.\d+)+)/" - -CVE_PRODUCT = "linux:linux_kernel_ixgbe" - -S = "${WORKDIR}/${BP}/src" -MODULES_INSTALL_TARGET = "install" - -EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' - -KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf" -KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf" - -inherit module - -do_install_append () { - # Install scripts/set_irq_affinity - install -d ${D}${sysconfdir}/network - install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network - - rm -rf ${D}${prefix}/man -} - -PACKAGES += "${PN}-script" - -FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" - -EXCLUDE_FROM_WORLD = "1" diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb new file mode 100644 index 00000000..ecd974fe --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb @@ -0,0 +1,42 @@ +SUMMARY="ixgbevf kernel driver for Intel Magnolia Park 10GbE" +DESCRIPTION="This virtual function driver supports kernel versions 2.6.x and newer \ +This driver supports 82599, X540, X550, and X552-based virtual function devices \ +that can only be activated on kernels that support SR-IOV. \ +SR-IOV requires the correct platform and OS support. \ +The guest OS loading this driver must support MSI-X interrupts." + +HOMEPAGE = "https://sourceforge.net/projects/e1000/" +SECTION = "kernel/network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" + +SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ + " + +SRC_URI[sha256sum] = "82d71eb04da5556171b4d776c5de61466801068738363847ef68d964c3d4735d" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" +UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P\d+(\.\d+)+)/" + +CVE_PRODUCT = "linux:linux_kernel_ixgbe" + +S = "${WORKDIR}/${BP}/src" + +EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' + +KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf" +KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf" + +inherit module + +do_install_append () { + # Install scripts/set_irq_affinity + install -d ${D}${sysconfdir}/network + install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network + + rm -rf ${D}${prefix}/man +} + +PACKAGES += "${PN}-script" + +FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" -- cgit v1.2.3-54-g00ecf