From d53dbb38c43da3fd04fed9a55e7b3b9e2c512b9a Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 7 Nov 2017 10:32:26 -0800 Subject: meta-intel: Reorganize the layout to remove common Remove the concept of the common directory and move all the recipes-* dirs to the top level as a normal layer would be. layer.conf is updated appropriately Signed-off-by: Saul Wold --- common/recipes-kernel/intel-ethernet/ixgbe.bb | 45 --------------------- .../ixgbe/0001-ixgbe-skip-host-depmod.patch | 31 --------------- ...-src-Makefile-change-make-install-to-make.patch | 40 ------------------- common/recipes-kernel/intel-ethernet/ixgbevf.bb | 46 ---------------------- .../ixgbevf/0001-ixgbevf-skip-host-depmod.patch | 31 --------------- ...-src-Makefile-change-make-install-to-make.patch | 32 --------------- .../ixgbevf/0002-ixgbevf_common.patch | 23 ----------- 7 files changed, 248 deletions(-) delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbe.bb delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbevf.bb delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch delete mode 100644 common/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch (limited to 'common/recipes-kernel/intel-ethernet') diff --git a/common/recipes-kernel/intel-ethernet/ixgbe.bb b/common/recipes-kernel/intel-ethernet/ixgbe.bb deleted file mode 100644 index 181158d4..00000000 --- a/common/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.1.3" -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] = "ae35ed547aa6a5087672c3f70ce1e676" -SRC_URI[sha256sum] = "9f537d79bddf0a087a17af632d57812d26d26bcfebbd4bdcf10df656ff055bb4" - -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/common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch b/common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch deleted file mode 100644 index e53f86e5..00000000 --- a/common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e32eab62e3f79ddd40946ca698d9e650bd7d9b2d Mon Sep 17 00:00:00 2001 -From: sweeaun -Date: Sat, 7 Oct 2017 20:49:36 -0700 -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 fa92f81..b39283a 100644 ---- a/Makefile -+++ b/Makefile -@@ -141,8 +141,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 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/common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch b/common/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch deleted file mode 100644 index 88f5335a..00000000 --- a/common/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/common/recipes-kernel/intel-ethernet/ixgbevf.bb b/common/recipes-kernel/intel-ethernet/ixgbevf.bb deleted file mode 100644 index 6a9636e6..00000000 --- a/common/recipes-kernel/intel-ethernet/ixgbevf.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY="ixgbevf 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 = "4.1.2" -PR = "r0" - -SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/ixgbevf-${PV}.tar.gz \ - file://0001-ixgbevf-src-Makefile-change-make-install-to-make.patch \ - file://0002-ixgbevf_common.patch \ - file://0001-ixgbevf-skip-host-depmod.patch \ - " - -SRC_URI[md5sum] = "f02ec46369d1ca949a1e9d2e0eb74d5f" -SRC_URI[sha256sum] = "ab2824541f8a2d8f7b7d26ccbb46359ef551c5d4625fb333014e2b8023ac3ab6" - -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 = " ixgbevf" -KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf" - -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/common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch b/common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch deleted file mode 100644 index 656a897d..00000000 --- a/common/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/common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch b/common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch deleted file mode 100644 index 8234f589..00000000 --- a/common/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 511ee0d8d40a3e76b3e9875a96228ff370dbdfc6 Mon Sep 17 00:00:00 2001 -From: "Goh, Wen Sen" -Date: Wed, 22 Jun 2016 11:25:41 +0800 -Subject: [PATCH] ixgbevf_patch - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 8df134a..8d5660e 100644 ---- a/Makefile -+++ b/Makefile -@@ -100,7 +100,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..." -@@ -145,6 +145,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/common/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch b/common/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch deleted file mode 100644 index d442e24d..00000000 --- a/common/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f74fbcd821a394dec58263fd2c2ea62eae298b2f Mon Sep 17 00:00:00 2001 -From: "Goh, Wen Sen" -Date: Sun, 26 Jun 2016 12:01:36 +0800 -Subject: [PATCH] ixgbevf patch - ---- - common.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/common.mk b/common.mk -index b9b01c7..228a926 100644 ---- a/common.mk -+++ b/common.mk -@@ -289,6 +289,7 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER} - kernelbuild = ${MAKE} $(if ${GCC_I_SYS},CC="${GCC_I_SYS}") \ - ${CCFLAGS_VAR}="${EXTRA_CFLAGS}" \ - -C "${KSRC}" \ -+ CONFIG_IXGBE=m \ - CONFIG_${DRIVER_UPPERCASE}=m \ - M="${CURDIR}" \ - ${2} ${1}; --- -2.8.3 -- cgit v1.2.3-54-g00ecf