Updated the DPDK recipe from v16.07 to v16.11. for dpdk v16.11 the rte_ivshmem feature has dropped and the default configuration file for packet_ordering example is replaced with the "native" x86 file.
Rename and modified the patch: dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch accordingly since this doesn't apply cleanly on top of dpdk v16.11 Removed the patches: dpdk-16.07-net-ixgbe-move-PCI-device-IDs-from-EAL.patch dpdk-16.07-net-igb-move-PCI-device-IDs-from-EAL.patch dpdk-16.07-kni-fix-build-with-kernel-4.8.patch from dpdk.inc since these changes/fix are now added in dpdk v16.11. Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gu...@intel.com> --- common/recipes-extended/dpdk/dpdk.inc | 7 ++----- ...6.11-dpdk-fix-installation-warning-and-issue.patch} | 18 +++++++++--------- .../dpdk/{dpdk_16.07.bb => dpdk_16.11.bb} | 4 ++-- 3 files changed, 13 insertions(+), 16 deletions(-) rename common/recipes-extended/dpdk/dpdk/{dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch => dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch} (89%) rename common/recipes-extended/dpdk/{dpdk_16.07.bb => dpdk_16.11.bb} (74%) diff --git a/common/recipes-extended/dpdk/dpdk.inc b/common/recipes-extended/dpdk/dpdk.inc index e90b13f..916e369 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 \ file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ - file://dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch \ + file://dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch \ file://dpdk-16.04-dpdk-fix-compilation-with-dynamic-libs.patch \ file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ - file://dpdk-16.07-net-ixgbe-move-PCI-device-IDs-from-EAL.patch \ - file://dpdk-16.07-net-igb-move-PCI-device-IDs-from-EAL.patch \ - file://dpdk-16.07-kni-fix-build-with-kernel-4.8.patch \ " COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" @@ -40,7 +37,7 @@ inherit module export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net" export RTE_SDK = "${S}" -export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "corei7", "x86_64-ivshmem-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}" +export RTE_TARGET="${@bb.utils.contains("TUNE_FEATURES", "corei7", "x86_64-native-linuxapp-gcc", "i686-native-linuxapp-gcc", d)}" export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include" 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 similarity index 89% rename from common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-installation-warning-and-issue.patch rename to common/recipes-extended/dpdk/dpdk/dpdk-16.11-dpdk-fix-installation-warning-and-issue.patch index 9fc3038..f1f625d 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 @@ -From 7af593cfca897a0f17d33aba95dd3e3d22a65444 Mon Sep 17 00:00:00 2001 +From 1dcd79d49b3ad987d6313a857a74fc9efbcd2667 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta <rahul.kumarxx.gu...@intel.com> -Date: Fri, 19 Aug 2016 11:50:46 +0800 +Date: Mon, 14 Nov 2016 10:35:51 +0800 Subject: [PATCH] dpdk: fix installation warning and issue Upstream-Status: Inappropriate [configuration] @@ -17,10 +17,10 @@ Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gu...@intel.com> 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk -index 5217063..7036a32 100644 +index 7b0d8b5..d27125c 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk -@@ -114,16 +114,13 @@ endif +@@ -115,16 +115,13 @@ endif install-runtime: $(Q)$(call rte_mkdir, $(DESTDIR)$(libdir)) @@ -32,7 +32,7 @@ index 5217063..7036a32 100644 - --exclude 'app/cmdline*' --exclude app/test \ - --exclude app/testacl --exclude app/testpipeline app | \ - tar -xf - -C $(DESTDIR)$(bindir) --strip-components=1 \ -- --keep-newer-files --warning=no-ignore-newer +- --keep-newer-files + $(Q)tar -cf - -C $O --exclude app/dpdk-pmdinfogen app | \ + tar -xf - -C $(DESTDIR)$(bindir) --no-same-owner --no-same-permissions \ + --strip-components=1 --keep-newer-files --warning=no-ignore-newer @@ -42,7 +42,7 @@ index 5217063..7036a32 100644 $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-setup.sh, \ $(DESTDIR)$(datadir)/tools/setup.sh) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/tools/dpdk-devbind.py, \ -@@ -137,7 +134,7 @@ install-runtime: +@@ -146,7 +143,7 @@ endif install-kmod: ifneq ($(wildcard $O/kmod/*),) $(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir)) @@ -51,9 +51,9 @@ index 5217063..7036a32 100644 endif install-sdk: -@@ -146,11 +143,9 @@ install-sdk: +@@ -155,11 +152,9 @@ install-sdk: tar -xf - -C $(DESTDIR)$(includedir) --strip-components=1 \ - --keep-newer-files --warning=no-ignore-newer + --keep-newer-files $(Q)$(call rte_mkdir, $(DESTDIR)$(sdkdir)) - $(Q)cp -a $(RTE_SDK)/mk $(DESTDIR)$(sdkdir) - $(Q)cp -a $(RTE_SDK)/scripts $(DESTDIR)$(sdkdir) @@ -66,7 +66,7 @@ index 5217063..7036a32 100644 $(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include) $(Q)$(call rte_symlink, $(DESTDIR)$(libdir), $(DESTDIR)$(targetdir)/lib) -@@ -166,4 +161,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) +@@ -175,4 +170,4 @@ ifneq ($(wildcard $O/doc/*/*/*pdf),) $(Q)cp -a $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides endif $(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 similarity index 74% rename from common/recipes-extended/dpdk/dpdk_16.07.bb rename to common/recipes-extended/dpdk/dpdk_16.11.bb index 55729cd..c544eb3 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 += "\ file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ " -SRC_URI[dpdk.md5sum] = "4afdc7951e21ff878a85ecade7f6f488" -SRC_URI[dpdk.sha256sum] = "cc982455a74357e465112bede5c29451b6eeb35f8c1c0dcea280dd3e7829f0e9" +SRC_URI[dpdk.md5sum] = "f51ffc862a4f57b0030ca5d7ff07fef0" +SRC_URI[dpdk.sha256sum] = "8098b3542b4c78d28bde5f4eba57d4ee929fffaaa941b7afd2b881eae0b45c00" export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" export ARCHDIR = "generic" -- 1.9.1 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel