From 37bf23766d41810f0eb86b4cbe3d5f2c900bb53c Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 15 May 2020 10:50:19 +0800 Subject: ixgbe: upgrade 5.6.5 -> 5.7.1 Use modules_install target for install and remove the depomod patch since that shouldn't be required now. Signed-off-by: Anuj Mittal --- .../ixgbe/0001-ixgbe-skip-host-depmod.patch | 31 --------------- recipes-kernel/intel-ethernet/ixgbe_5.6.5.bb | 44 ---------------------- recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb | 41 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 75 deletions(-) delete mode 100644 recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch delete mode 100644 recipes-kernel/intel-ethernet/ixgbe_5.6.5.bb create mode 100644 recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch deleted file mode 100644 index 0041af57..00000000 --- a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5f87ef7ed60bc9762467184ed0a6d000b80713d9 Mon Sep 17 00:00:00 2001 -From: sweeaun -Date: Sun, 8 Apr 2018 17:21:52 +0800 -Subject: [PATCH] ixgbe: 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 545489a..07e422f 100644 ---- a/Makefile -+++ b/Makefile -@@ -141,8 +141,6 @@ install: default manfile - @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz - @echo "Installing modules..." - @+$(call devkernelbuild,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/ixgbe_5.6.5.bb b/recipes-kernel/intel-ethernet/ixgbe_5.6.5.bb deleted file mode 100644 index 95bb1d7d..00000000 --- a/recipes-kernel/intel-ethernet/ixgbe_5.6.5.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE" -DESCRIPTION="The ixgbe driver supports 82598- and 82599-based \ -PCI Express* 10 Gigabit Network Connections." - -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/ixgbe%20stable/${PV}/${BP}.tar.gz \ - file://0001-ixgbe-skip-host-depmod.patch \ - " - -SRC_URI[md5sum] = "172bc41f403b4a5904eb44d911af54d3" -SRC_URI[sha256sum] = "08170d6719bb33fe8e08da2296729c77899e48c201115bdb81e4d492a1b21399" - -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/" -UPSTREAM_CHECK_REGEX = "ixgbe%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 = " ixgbe" -KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe" - -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/ixgbe_5.7.1.bb b/recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb new file mode 100644 index 00000000..1c767332 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbe_5.7.1.bb @@ -0,0 +1,41 @@ +SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE" +DESCRIPTION="The ixgbe driver supports 82598- and 82599-based \ +PCI Express* 10 Gigabit Network Connections." + +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/ixgbe%20stable/${PV}/${BP}.tar.gz \ + " + +SRC_URI[sha256sum] = "2eb7d12e4b61412e217b9d78a196485a8ea02cb18368a55e59081b3d21e24215" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/" +UPSTREAM_CHECK_REGEX = "ixgbe%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 = " ixgbe" +KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe" + +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" -- cgit v1.2.3-54-g00ecf