diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-05-15 10:50:20 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-06-03 11:25:08 +0800 |
commit | b1f11d71cb2e0483225572ae2703d6634a04933e (patch) | |
tree | 76949773161f7bdb0cb2ee143858e826880d8770 /recipes-kernel/intel-ethernet | |
parent | 858e7f0f03fe514f0a5b99abde9a5ebc52f55b9c (diff) | |
download | meta-intel-b1f11d71cb2e0483225572ae2703d6634a04933e.tar.gz |
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 <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-kernel/intel-ethernet')
-rw-r--r-- | recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch | 31 | ||||
-rw-r--r-- | recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb (renamed from recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb) | 7 |
2 files changed, 1 insertions, 37 deletions
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 @@ | |||
1 | From 9677d09f5c3984997ac8e7d90b5d4b11fb9ce277 Mon Sep 17 00:00:00 2001 | ||
2 | From: sweeaun <swee.aun.khor@intel.com> | ||
3 | Date: Sat, 7 Oct 2017 20:56:35 -0700 | ||
4 | Subject: [PATCH] ixgbevf: skip host depmod | ||
5 | |||
6 | Upstream-Status: Inappropriate [Cross-Compile] | ||
7 | |||
8 | Depmod during do_install is irrelevant when cross-compiling. | ||
9 | Remove the depmod steps during do_install. | ||
10 | |||
11 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | ||
12 | --- | ||
13 | Makefile | 2 -- | ||
14 | 1 file changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index 91df705..1dcf350 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -104,8 +104,6 @@ modules_install: default manfile | ||
21 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
22 | @echo "Installing modules..." | ||
23 | @+$(call kernelbuild,modules_install) | ||
24 | - @echo "Running depmod..." | ||
25 | - @$(call cmd_depmod) | ||
26 | |||
27 | uninstall: | ||
28 | rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko; | ||
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb index 0b3b461e..ecd974fe 100644 --- a/recipes-kernel/intel-ethernet/ixgbevf_4.6.3.bb +++ b/recipes-kernel/intel-ethernet/ixgbevf_4.7.1.bb | |||
@@ -11,11 +11,9 @@ LICENSE = "GPLv2" | |||
11 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" | 11 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" |
12 | 12 | ||
13 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ | 13 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ |
14 | file://0001-ixgbevf-skip-host-depmod.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | SRC_URI[md5sum] = "9258960e4d005c7da546cb8dca7bedc5" | 16 | SRC_URI[sha256sum] = "82d71eb04da5556171b4d776c5de61466801068738363847ef68d964c3d4735d" |
18 | SRC_URI[sha256sum] = "740bb4822c54e5f9bc6a6e73ec562058cb9a27264d727453011c3725d3dd9ad2" | ||
19 | 17 | ||
20 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" | 18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" |
21 | UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" | 19 | UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" |
@@ -23,7 +21,6 @@ UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" | |||
23 | CVE_PRODUCT = "linux:linux_kernel_ixgbe" | 21 | CVE_PRODUCT = "linux:linux_kernel_ixgbe" |
24 | 22 | ||
25 | S = "${WORKDIR}/${BP}/src" | 23 | S = "${WORKDIR}/${BP}/src" |
26 | MODULES_INSTALL_TARGET = "install" | ||
27 | 24 | ||
28 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | 25 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' |
29 | 26 | ||
@@ -43,5 +40,3 @@ do_install_append () { | |||
43 | PACKAGES += "${PN}-script" | 40 | PACKAGES += "${PN}-script" |
44 | 41 | ||
45 | FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" | 42 | FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" |
46 | |||
47 | EXCLUDE_FROM_WORLD = "1" | ||