Move the inclusion of patch:
    dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch

    from dpdk.inc to version specific dpdk bb files where it needs to be 
applied.

    This patch does not apply cleanly on top of dpdk v2.2.0.

Signed-off-by: Rahul Kumar Gupta <[email protected]>
---
 meta-isg/common/recipes-extended/dpdk/dpdk.inc      | 2 --
 meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb | 3 ++-
 meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb | 3 ++-
 meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc 
b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
index e08594c..6dc6bff 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc
@@ -4,11 +4,9 @@ LICENSE = "BSD & LGPLv2 & GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
 SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \
-          
file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
           
file://dpdk-1.8.0-and-2.0.0-add-sysroot-option-within-app-makefile.patch \
           
file://dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch \
          "
-
 COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64"
 
 # dpdk example apps dpdk_qat and vhost have dependancy on fuse and qat.
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb 
b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
index 82f801e..e361e9f 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk_1.8.0.bb
@@ -1,6 +1,7 @@
 include dpdk.inc
 
-SRC_URI += 
"file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch
 \
+SRC_URI += 
"file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
+            
file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch
 \
             
file://dpdk-1.8.0-and-2.0.0-ixgbe-fix-a-build-warning-being-treated-as-error.patch
 \
             file://dpdk-1.8.0-kni-fix-build-with-kernel-3.19.patch \
             file://dpdk-2.0.0-kni-fix-build-with-kernel-4.0.patch \
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb 
b/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb
index e45d6b8..a70d977 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk_2.0.0.bb
@@ -1,6 +1,7 @@
 include dpdk.inc
 
-SRC_URI += 
"file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \
+SRC_URI += 
"file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \
+            
file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \
             
file://dpdk-1.8.0-and-2.0.0-examples-add-config-variable-to-enable-disable-dpdk.patch
 \
             
file://dpdk-1.8.0-and-2.0.0-ixgbe-fix-a-build-warning-being-treated-as-error.patch
 \
             file://dpdk-2.0.0-kni-fix-build-with-kernel-4.0.patch \
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb 
b/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb
index 7a7af6f..82b7697 100644
--- a/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk_2.1.0.bb
@@ -1,6 +1,6 @@
 include dpdk.inc
 
-SRC_URI += "\
+SRC_URI += 
"file://dpdk-1.8.0-and-2.0.0-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch\
             
file://dpdk-2.1.0-add-config-variable-to-enable-disable-dpdk_qat.patch \
             
file://dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch \
             "
-- 
1.9.1

-- 
_______________________________________________
meta-intel mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-intel

Reply via email to