From e252ee850f4062d4dae266f2df95d25dfc88dff2 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Mon, 27 May 2019 18:27:09 +0800 Subject: Move two patches to the version specific bb These two patches can't be applied to the new version DPDK, so move them to the version specific bb. Signed-off-by: Kevin Hao Signed-off-by: Anuj Mittal --- recipes-extended/dpdk/dpdk.inc | 2 -- recipes-extended/dpdk/dpdk_17.11.3.bb | 6 +++++- recipes-extended/dpdk/dpdk_18.05.bb | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 92042bb..a0e081a 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -8,8 +8,6 @@ S = "${WORKDIR}/git" SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \ file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ - file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ - file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ " COMPATIBLE_MACHINE = "null" diff --git a/recipes-extended/dpdk/dpdk_17.11.3.bb b/recipes-extended/dpdk/dpdk_17.11.3.bb index b4b0023..7fc89d2 100644 --- a/recipes-extended/dpdk/dpdk_17.11.3.bb +++ b/recipes-extended/dpdk/dpdk_17.11.3.bb @@ -8,4 +8,8 @@ LICENSE = "LGPLv2 & GPLv2" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe\ file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" -SRC_URI += "file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch" +SRC_URI += "\ + file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ + file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ + file://dpdk-17.11-Fix-strncpy-error-for-GCC8.patch \ +" diff --git a/recipes-extended/dpdk/dpdk_18.05.bb b/recipes-extended/dpdk/dpdk_18.05.bb index 108d683..b6897a8 100644 --- a/recipes-extended/dpdk/dpdk_18.05.bb +++ b/recipes-extended/dpdk/dpdk_18.05.bb @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4 file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" SRC_URI += "\ + file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ + file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ file://dpdk-16.04-dpdk-enable-ip_fragmentation-in-common_base-config.patch \ file://0001-examples-Fix-maybe-uninitialized-warning.patch \ " -- cgit v1.2.3-54-g00ecf