From 6dbb5b709b51cb3fbc94fbf3e14cd02972394747 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 12 Apr 2018 13:16:12 +0800 Subject: ixgbe: cleanup recipe * Remove unnecessary code and include version info in recipe name. * Change do_install to use S instead of WORKDIR. Using S would fail when used with devtool that relies on externalsrc class. * Better description and proper project page. Signed-off-by: Anuj Mittal Signed-off-by: California Sullivan --- recipes-kernel/intel-ethernet/ixgbe.bb | 45 ---------------------- .../ixgbe/0001-ixgbe-skip-host-depmod.patch | 8 ++-- ...-src-Makefile-change-make-install-to-make.patch | 40 ------------------- recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb | 37 ++++++++++++++++++ 4 files changed, 41 insertions(+), 89 deletions(-) delete mode 100644 recipes-kernel/intel-ethernet/ixgbe.bb delete mode 100644 recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch create mode 100644 recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb (limited to 'recipes-kernel/intel-ethernet') diff --git a/recipes-kernel/intel-ethernet/ixgbe.bb b/recipes-kernel/intel-ethernet/ixgbe.bb deleted file mode 100644 index e23d57a3..00000000 --- a/recipes-kernel/intel-ethernet/ixgbe.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE" -DESCRIPTION="Intel 10-Gbps Ethernet driver for Magnolia Park" -AUTHOR = "Ong Boon Leong" -HOMEPAGE = "http://www.intel.com/network/connectivity/products/server_adapters.htm" -SECTION = "kernel/network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PV = "5.3.6" -PR = "r0" - -SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/ixgbe-${PV}.tar.gz \ - file://0001-ixgbe-src-Makefile-change-make-install-to-make.patch \ - file://0001-ixgbe-skip-host-depmod.patch \ - " - -SRC_URI[md5sum] = "d6816f2b6b8bddfa2d78267f84770d91" -SRC_URI[sha256sum] = "6ba26de1bb9b55b92f5f54c6c7b25f837323ec3322a6ee54e882c8e54e6d0eaa" - -S = "${WORKDIR}/${PN}-${PV}/src" -SCRIPT_DIR = "${WORKDIR}/${PN}-${PV}/scripts" - -EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" \ - BUILD_ARCH="${TARGET_ARCH}" PREFIX="${D}" \ - SYSTEM_MAP_FILE="${STAGING_KERNEL_BUILDDIR}/System.map-${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}/etc/network - install -m 0755 ${SCRIPT_DIR}/set_irq_affinity ${D}/etc/network -} - -#SSTATE_DUPWHITELIST += "${STAGING_DIR_HOST}/lib/modules/${KERNEL_VERSION}/" - -PACKAGES += "${PN}-script" - -FILES_${PN}-script += "/etc/network/set_irq_affinity" - -#Ignore "ERROR: QA Issue: ixgbe: Files/directories were installed but not shipped" -INSANE_SKIP_${PN} = "installed-vs-shipped" 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 index e53f86e5..0041af57 100644 --- a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch +++ b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch @@ -1,6 +1,6 @@ -From e32eab62e3f79ddd40946ca698d9e650bd7d9b2d Mon Sep 17 00:00:00 2001 +From 5f87ef7ed60bc9762467184ed0a6d000b80713d9 Mon Sep 17 00:00:00 2001 From: sweeaun -Date: Sat, 7 Oct 2017 20:49:36 -0700 +Date: Sun, 8 Apr 2018 17:21:52 +0800 Subject: [PATCH] ixgbe: skip host depmod Upstream-Status: Inappropriate [Cross-Compile] @@ -14,10 +14,10 @@ Signed-off-by: sweeaun 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile -index fa92f81..b39283a 100644 +index 545489a..07e422f 100644 --- a/Makefile +++ b/Makefile -@@ -141,8 +141,6 @@ modules_install: default manfile +@@ -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) diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch deleted file mode 100644 index 88f5335a..00000000 --- a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 09c7a5afa76530a3720d97726f2b372f72b0af08 Mon Sep 17 00:00:00 2001 -From: "Goh, Wen Sen" -Date: Wed, 22 Jun 2016 11:18:37 +0800 -Subject: [PATCH] ixgbe: src/Makefile: change make install to make - modules_install - -Per guideline from Linux Documentation at -Documentation/kbuild/modules.txt -the correct target is "modules_install" not "install". - -Upstream-Status: Inappropriate [It is tarball released by Intel Network -driver group] - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 852becb..480ecee 100644 ---- a/Makefile -+++ b/Makefile -@@ -136,7 +136,7 @@ clean: - @-rm -rf *.${MANSECTION}.gz *.ko - - # Install the modules and manpage --install: default manfile -+modules_install: default manfile - @echo "Copying manpages..." - @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz - @echo "Installing modules..." -@@ -191,6 +191,6 @@ help: - @echo ' Other variables may be available for tuning make process, see' - @echo ' Kernel Kbuild documentation for more information' - --.PHONY: default noisy clean manfile silent sparse ccc install uninstall help -+.PHONY: default noisy clean manfile silent sparse ccc modules_install uninstall help - - endif # ifneq($(KERNELRELEASE),) --- -2.8.3 diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb b/recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb new file mode 100644 index 00000000..8d71ac55 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbe_5.3.6.bb @@ -0,0 +1,37 @@ +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=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \ + file://0001-ixgbe-skip-host-depmod.patch \ + " + +SRC_URI[md5sum] = "d6816f2b6b8bddfa2d78267f84770d91" +SRC_URI[sha256sum] = "6ba26de1bb9b55b92f5f54c6c7b25f837323ec3322a6ee54e882c8e54e6d0eaa" + +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" -- cgit v1.2.3-54-g00ecf