diff options
-rw-r--r-- | common/recipes-extended/dpdk/dpdk.inc | 7 | ||||
-rw-r--r-- | common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch (renamed from common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch) | 18 | ||||
-rw-r--r-- | common/recipes-extended/dpdk/dpdk_16.11.bb (renamed from common/recipes-extended/dpdk/dpdk_16.07.bb) | 4 |
3 files changed, 13 insertions, 16 deletions
diff --git a/common/recipes-extended/dpdk/dpdk.inc b/common/recipes-extended/dpdk/dpdk.inc index e90b13f7..916e3695 100644 --- a/common/recipes-extended/dpdk/dpdk.inc +++ b/common/recipes-extended/dpdk/dpdk.inc | |||
@@ -8,12 +8,9 @@ SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ | |||
8 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ | 8 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ |
9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ | 9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ |
10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ | 10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ |
11 | file://dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch \ | 11 | file://dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch \ |
12 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ | 12 | file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ |
13 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ | 13 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ |
14 | file://dpdk-16.07-net-ixgbe-move-PCI-device-IDs-from-EAL.patch \ | ||
15 | file://dpdk-16.07-net-igb-move-PCI-device-IDs-from-EAL.patch \ | ||
16 | file://dpdk-16.07-kni-fix-build-with-kernel-4.8.patch \ | ||
17 | " | 14 | " |
18 | 15 | ||
19 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" | 16 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" |
@@ -40,7 +37,7 @@ inherit module | |||
40 | 37 | ||
41 | export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" | 38 | export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" |
42 | export RTE_SDK = "${S}" | 39 | export RTE_SDK = "${S}" |
43 | export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "corei7", "x86_64-ivshmem-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}" | 40 | export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "corei7", "x86_64-native-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}" |
44 | 41 | ||
45 | export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" | 42 | export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" |
46 | export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" | 43 | export ICP_LIB_ROOT= "${PKG_CONFIG_SYSROOT_DIR}/usr/lib" |
diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch b/common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch index 9fc30381..f1f625d8 100644 --- a/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch +++ b/common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 7af593cfca897a0f17d33aba95dd3e3d22a65444 Mon Sep 17 00:00:00 2001 | 1 | From 1dcd79d49b3ad987d6313a857a74fc9efbcd2667 Mon Sep 17 00:00:00 2001 |
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
3 | Date: Fri, 19 Aug 2016 11:50:46 +0800 | 3 | Date: Mon, 14 Nov 2016 10:35:51 +0800 |
4 | Subject: [PATCH] dpdk: fix installation warning and issue | 4 | Subject: [PATCH] dpdk: fix installation warning and issue |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
@@ -17,10 +17,10 @@ Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | |||
17 | 1 file changed, 10 insertions(+), 15 deletions(-) | 17 | 1 file changed, 10 insertions(+), 15 deletions(-) |
18 | 18 | ||
19 | diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk | 19 | diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk |
20 | index 5217063..7036a32 100644 | 20 | index 7b0d8b5..d27125c 100644 |
21 | --- a/mk/rte.sdkinstall.mk | 21 | --- a/mk/rte.sdkinstall.mk |
22 | +++ b/mk/rte.sdkinstall.mk | 22 | +++ b/mk/rte.sdkinstall.mk |
23 | @@ -114,16 +114,13 @@ endif | 23 | @@ -115,16 +115,13 @@ endif |
24 | 24 | ||
25 | install-runtime: | 25 | install-runtime: |
26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) | 26 | $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) |
@@ -32,7 +32,7 @@ index 5217063..7036a32 100644 | |||
32 | - --exclude 'app/cmdline*' --exclude app/test \ | 32 | - --exclude 'app/cmdline*' --exclude app/test \ |
33 | - --exclude app/testacl --exclude app/testpipeline app | \ | 33 | - --exclude app/testacl --exclude app/testpipeline app | \ |
34 | - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ | 34 | - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ |
35 | - --keep-newer-files --warning=no-ignore-newer | 35 | - --keep-newer-files |
36 | + $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \ | 36 | + $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \ |
37 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ | 37 | + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ |
38 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer | 38 | + --strip-components=1 --keep-newer-files --warning=no-ignore-newer |
@@ -42,7 +42,7 @@ index 5217063..7036a32 100644 | |||
42 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \ | 42 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \ |
43 | $(DESTDIR)$(datadir)/tools/setup.sh) | 43 | $(DESTDIR)$(datadir)/tools/setup.sh) |
44 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ | 44 | $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ |
45 | @@ -137,7 +134,7 @@ install-runtime: | 45 | @@ -146,7 +143,7 @@ endif |
46 | install-kmod: | 46 | install-kmod: |
47 | ifneq ($(wildcard $O/kmod/*),) | 47 | ifneq ($(wildcard $O/kmod/*),) |
48 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) | 48 | $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) |
@@ -51,9 +51,9 @@ index 5217063..7036a32 100644 | |||
51 | endif | 51 | endif |
52 | 52 | ||
53 | install-sdk: | 53 | install-sdk: |
54 | @@ -146,11 +143,9 @@ install-sdk: | 54 | @@ -155,11 +152,9 @@ install-sdk: |
55 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ | 55 | tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ |
56 | --keep-newer-files --warning=no-ignore-newer | 56 | --keep-newer-files |
57 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) | 57 | $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) |
58 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) | 58 | - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) |
59 | - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) | 59 | - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) |
@@ -66,7 +66,7 @@ index 5217063..7036a32 100644 | |||
66 | $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) | 66 | $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) |
67 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) | 67 | $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) |
68 | 68 | ||
69 | @@ -166,4 +161,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) | 69 | @@ -175,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) |
70 | $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides | 70 | $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides |
71 | endif | 71 | endif |
72 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) | 72 | $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) |
diff --git a/common/recipes-extended/dpdk/dpdk_16.07.bb b/common/recipes-extended/dpdk/dpdk_16.11.bb index 55729cd9..c544eb34 100644 --- a/common/recipes-extended/dpdk/dpdk_16.07.bb +++ b/common/recipes-extended/dpdk/dpdk_16.11.bb | |||
@@ -5,8 +5,8 @@ SRC_URI += "\ | |||
5 | file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ | 5 | file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRC_URI[dpdk.md5sum] = "4afdc7951e21ff878a85ecade7f6f488" | 8 | SRC_URI[dpdk.md5sum] = "f51ffc862a4f57b0030ca5d7ff07fef0" |
9 | SRC_URI[dpdk.sha256sum] = "cc982455a74357e465112bede5c29451b6eeb35f8c1c0dcea280dd3e7829f0e9" | 9 | SRC_URI[dpdk.sha256sum] = "8098b3542b4c78d28bde5f4eba57d4ee929fffaaa941b7afd2b881eae0b45c00" |
10 | 10 | ||
11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" | 11 | export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" |
12 | export ARCHDIR = "generic" | 12 | export ARCHDIR = "generic" |