The patch can't apply because of a difference between the master branch and pyro. I noticed that the master branch has a dpdk related commit that is not incorporated in the pyro branch. I'm referring to commit d90da5961da727d28a963f814cd164c0abf24bbf, dpdk: Disable build for MUSL. Will this commit be incorporated in the pyro branch?
Kind regards Johan -----Original Message----- From: Wold, Saul Sent: Thursday, July 27, 2017 12:31 AM To: [email protected]; Syed Mohamad Fauzi, Syed Johan Arif <[email protected]> Subject: Re: [meta-intel] [PATCH] dpdk: DPDK upgrade to version 17.05 This patch does not apply to the master branch of meta-intel, you need to ensure this is against master please. Thanks Sau! On Wed, 2017-07-26 at 16:23 +0800, Syed Mohamad Fauzi, Syed Johan Arif wrote: > Signed-off-by: Syed Mohamad Fauzi, Syed Johan Arif <syed.johan.arif.s > [email protected]> > --- > common/recipes-extended/dpdk/dpdk.inc | 6 +-- > ...onfig-variable-to-enable-disable-dpdk_qat.patch | 31 ------------ > ---- > ...4-point-to-the-right-include-and-lib-path.patch | 43 ------------ > ---------- > ...dk-16.07-dpdk-fix-for-parellel-make-issue.patch | 6 +-- > common/recipes-extended/dpdk/dpdk_17.02.bb | 19 ---------- > common/recipes-extended/dpdk/dpdk_17.05.bb | 18 +++++++++ > 6 files changed, 24 insertions(+), 99 deletions(-) delete mode > 100644 common/recipes-extended/dpdk/dpdk/dpdk-16.04-add- > config-variable-to-enable-disable-dpdk_qat.patch > delete mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-16.04- > point-to-the-right-include-and-lib-path.patch > delete mode 100644 common/recipes-extended/dpdk/dpdk_17.02.bb > create mode 100644 common/recipes-extended/dpdk/dpdk_17.05.bb > > diff --git a/common/recipes-extended/dpdk/dpdk.inc b/common/recipes- > extended/dpdk/dpdk.inc index 77bd4a8..b8bd2ad 100644 > --- a/common/recipes-extended/dpdk/dpdk.inc > +++ b/common/recipes-extended/dpdk/dpdk.inc > @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=75141926 > 0aa954499f7abaabaa882bbe" > SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ > 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.04-point-to-the-right-include-and-lib- > path.patch \ > file://dpdk-16.04-Fix-for-misleading-indentation- > error.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-17.02-dpdk-fix-installation-warning-and- > issue.patch \ > " > > -COMPATIBLE_MACHINE = "intel-corei7-64" > +COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64|intel-core2-32" > > # dpdk example apps dpdk_qat and vhost have dependancy on fuse and > qat. > # fuse is in meta-filesystems and qat is not yet upstreamed. > @@ -59,7 +58,8 @@ def get_dpdk_target_mach(bb, d): > "mohonpeak64": "atm", > "mohonpeak32": "atm", > "crystalforest": "ivb", > - "intel_corei7_64": "hsw", > + "intel_corei7_64": "atm", > + "intel_core2_32": "atm", > } > > if target_arch in multiarch_options : > diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config- > variable-to-enable-disable-dpdk_qat.patch b/common/recipes- > extended/dpdk/dpdk/dpdk-16.04-add-config-variable-to-enable-disable- > dpdk_qat.patch > deleted file mode 100644 > index cd51705..0000000 > --- a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-add-config- > variable-to-enable-disable-dpdk_qat.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From a424a79b1422f1877de3ee7aee6f781aeacc3630 Mon Sep 17 00:00:00 > 2001 > -From: Anuj Mittal <[email protected]> > -Date: Tue, 18 Aug 2015 12:36:02 +0800 > -Subject: [PATCH] examples: add config variable to enable/disable > dpdk_qat > - > -Upstream-Status: Inappropriate [configuration] > - > -Add CONFIG_EXAMPLE_DPDK_QAT to control compilation of dpdk_qat > -example by PACKAGECONFIG > - > -Signed-off-by: Anuj Mittal <[email protected]> > ---- > - examples/Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/examples/Makefile b/examples/Makefile -index > b4eddbd..1bc14b0 100644 > ---- a/examples/Makefile > -+++ b/examples/Makefile > -@@ -41,7 +41,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond > - DIRS-y += cmdline > - DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor > - ifneq ($(ICP_ROOT),) > --DIRS-y += dpdk_qat > -+DIRS-$(CONFIG_EXAMPLE_DPDK_QAT) += dpdk_qat > - endif > - DIRS-y += exception_path > - DIRS-y += helloworld > --- > -1.7.9.5 > - > diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to- > the-right-include-and-lib-path.patch b/common/recipes- > extended/dpdk/dpdk/dpdk-16.04-point-to-the-right-include-and-lib- > path.patch > deleted file mode 100644 > index 75bb517..0000000 > --- a/common/recipes-extended/dpdk/dpdk/dpdk-16.04-point-to-the- > right-include-and-lib-path.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 928595c80ae28d19861d7e76ed898a8fb3f2c1dc Mon Sep 17 00:00:00 > 2001 > -From: Anuj Mittal <[email protected]> > -Date: Fri, 24 Jul 2015 23:57:17 +0800 > -Subject: [PATCH] dpdk: point to the right include and lib path > - > -Upstream-Status: Inappropriate [Configuration] > - > -Make sure that we point to the right location of qat -lac headers and > library. > - > -Signed-off-by: Anuj Mittal <[email protected]> > ---- > - examples/dpdk_qat/Makefile | 7 ++----- > - 1 file changed, 2 insertions(+), 5 deletions(-) > - > -diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile > -index f1e06a1..5b906f7 100644 > ---- a/examples/dpdk_qat/Makefile > -+++ b/examples/dpdk_qat/Makefile > -@@ -66,18 +66,15 @@ SRCS-y := main.c crypto.c > - > - CFLAGS += -O3 > - CFLAGS += $(WERROR_FLAGS) > --CFLAGS += -I$(ICP_ROOT)/quickassist/include \ > -- -I$(ICP_ROOT)/quickassist/include/lac \ > -- -I$(ICP_ROOT)/quickassist/lookaside/access_layer/in > clude > -+CFLAGS += -I$(ICP_LAC_API_DIR) > - > - # From CRF 1.2 driver, library was renamed to libicp_qa_al.a > - ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),) > - ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a > - else > --ICP_LIBRARY_PATH = $(ICP_ROOT)/build/libicp_qa_al.a > -+ICP_LIBRARY_PATH = $(ICP_LIB_ROOT)/libicp_qa_al.a > - endif > - > --LDLIBS += -L$(ICP_ROOT)/build > - LDLIBS += $(ICP_LIBRARY_PATH) \ > - -lz \ > - -losal \ > --- > -1.7.9.5 > - > diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix- > for-parellel-make-issue.patch b/common/recipes- > extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch > index e17d80d..fc965fa 100644 > --- a/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for- > parellel-make-issue.patch > +++ b/common/recipes-extended/dpdk/dpdk/dpdk-16.07-dpdk-fix-for- > parellel-make-issue.patch > @@ -18,9 +18,9 @@ index 18b41b9..c7c2beb 100644 > --- a/examples/Makefile > +++ b/examples/Makefile > @@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += > distributor > - ifneq ($(ICP_ROOT),) > - DIRS-y += dpdk_qat > - endif > + DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond DIRS-y += cmdline > + DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor > +DEPDIRS-y += examples/ethtool/lib > DIRS-y += ethtool > DIRS-y += exception_path > diff --git a/common/recipes-extended/dpdk/dpdk_17.02.bb > b/common/recipes-extended/dpdk/dpdk_17.02.bb > deleted file mode 100644 > index ed54969..0000000 > --- a/common/recipes-extended/dpdk/dpdk_17.02.bb > +++ /dev/null > @@ -1,19 +0,0 @@ > -include dpdk.inc > - > -SRC_URI += "\ > - file://dpdk-16.04-add-config-variable-to-enable-disable- > dpdk_qat.patch \ > - file://dpdk-16.04-dpdk-enable-ip_fragmentation-in- > common_base-config.patch \ > - " > - > -SRC_URI[dpdk.md5sum] = "9ac25cffecbf550e145c45e53db03a3d" > -SRC_URI[dpdk.sha256sum] = > "b07b546e910095174bdb6152bb0d7ce057cc4b79aaa74771aeee4e8a7219fb38" > - > -export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" > -export ARCHDIR = "generic" > - > -do_configure_prepend () { > - sed -e > "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE > _VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp -} > - > -COMPATIBLE_HOST_linux-gnux32 = "null" > -COMPATIBLE_HOST_libc-musl_class-target = "null" > diff --git a/common/recipes-extended/dpdk/dpdk_17.05.bb > b/common/recipes-extended/dpdk/dpdk_17.05.bb > new file mode 100644 > index 0000000..9c23fad > --- /dev/null > +++ b/common/recipes-extended/dpdk/dpdk_17.05.bb > @@ -0,0 +1,18 @@ > +include dpdk.inc > + > +SRC_URI += "\ > + file://dpdk-16.04-dpdk-enable-ip_fragmentation-in- > common_base-config.patch \ > + " > + > +SRC_URI[dpdk.md5sum] = "39c4e1110dd1ef9dab33edbae820f939" > +SRC_URI[dpdk.sha256sum] = > "763bfb7e1765efcc949e79d645dc9f1ebd16591431ba0db5ce22becd928dcd0a" > + > +export EXAMPLES_BUILD_DIR = "${RTE_TARGET}" > +export ARCHDIR = "generic" > + > +do_configure_prepend () { > + sed -e > "s#CONFIG_RTE_LIBRTE_POWER=y#CONFIG_RTE_LIBRTE_POWER=${CONFIG_EXAMPLE > _VM_POWER_MANAGER}#" -i ${S}/config/common_linuxapp > +} > + > +COMPATIBLE_HOST_linux-gnux32 = "null" > +COMPATIBLE_HOST_libc-musl_class-target = "null" > -- > 1.9.1 > -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
