From: Chan Wei Sern <wei.sern.c...@intel.com> Intel DPDK v1.6.0r2 examples, qos_sched, eal_flags_autotest and cmdline_autotest have build failure in build. As above failures are not planned to be fixed in v1.6.0r2, so we resolve them by cherry-picking patches from v1.7.0 instead.
Signed-off-by: Chan Wei Sern <wei.sern.c...@intel.com> --- ...ix-build-switches-to-enable-cmdline-tests.patch | 49 ++++++++++++++++++++++ ...dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch | 31 ++++++++++++++ ...k-1.6.0r2-examples-qos_sched-fix-makefile.patch | 31 ++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch create mode 100644 common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch b/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch new file mode 100644 index 0000000..eab4776 --- /dev/null +++ b/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-app-test-fix-build-switches-to-enable-cmdline-tests.patch @@ -0,0 +1,49 @@ +From cf953d2bfa7df9aa67459b333db4d4d8a9e72fd6 Mon Sep 17 00:00:00 2001 +From: Thomas Monjalon <thomas.monja...@6wind.com> +Date: Fri, 27 Jun 2014 11:21:11 +0200 +Subject: [PATCH] app/test: fix build switches to enable cmdline tests + +There were 2 typos since these commits (in 1.6.0 releases): + 21a7f4e264 fix build without librte_cmdline + cac6d08c8b replace --use-device option by --pci-whitelist and --vdev +In makefiles, the build options are prefixed with CONFIG_RTE_ +but in .c file, it is only RTE_. + +These typos were disabling cmdline unit tests and test of "--vdev eth_ring" option. + +Signed-off-by: Thomas Monjalon <thomas.monja...@6wind.com> +Acked-by: Pablo de Lara <pablo.de.lara.gua...@intel.com> +--- + app/test/test_cmdline.c | 2 +- + app/test/test_eal_flags.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/app/test/test_cmdline.c b/app/test/test_cmdline.c +index 77475c4..10a3f77 100644 +--- a/app/test/test_cmdline.c ++++ b/app/test/test_cmdline.c +@@ -39,7 +39,7 @@ + int + test_cmdline(void) + { +-#ifdef CONFIG_RTE_LIBRTE_CMDLINE ++#ifdef RTE_LIBRTE_CMDLINE + printf("Testind parsing ethernet addresses...\n"); + if (test_parse_etheraddr_valid() < 0) + return -1; +diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c +index a862654..1b80b80 100644 +--- a/app/test/test_eal_flags.c ++++ b/app/test/test_eal_flags.c +@@ -317,7 +317,7 @@ test_whitelist_flag(void) + const char *wlval3[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1", + pci_whitelist, "09:0B.3,type=test", + pci_whitelist, "08:00.1,type=normal", +-#ifdef CONFIG_RTE_LIBRTE_PMD_RING ++#ifdef RTE_LIBRTE_PMD_RING + vdev, "eth_ring,arg=test", + #endif + }; +-- +1.9.1 + diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch b/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch new file mode 100644 index 0000000..971d0c5 --- /dev/null +++ b/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-eal-fix-option-base-virtaddr.patch @@ -0,0 +1,31 @@ +From be1816f59e772e427fc5815281f9458a9314973a Mon Sep 17 00:00:00 2001 +From: Pablo de Lara <pablo.de.lara.gua...@intel.com> +Date: Thu, 19 Jun 2014 16:35:22 +0100 +Subject: [PATCH] eal: fix option --base-virtaddr + +When parsing EAL option --base-virtaddr +errno was not being set to 0 before calling strtoull, +therefore function might fail unnecesarily. + +Signed-off-by: Pablo de Lara <pablo.de.lara.gua...@intel.com> +Signed-off-by: Aaron Campbell <aa...@arbor.net> +Acked-by: Anatoly Burakov <anatoly.bura...@intel.com> +--- + lib/librte_eal/linuxapp/eal/eal.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c +index 6994303..d204387 100644 +--- a/lib/librte_eal/linuxapp/eal/eal.c ++++ b/lib/librte_eal/linuxapp/eal/eal.c +@@ -562,6 +562,7 @@ eal_parse_base_virtaddr(const char *arg) + char *end; + uint64_t addr; + ++ errno = 0; + addr = strtoull(arg, &end, 16); + + /* check for errors */ +-- +1.9.1 + diff --git a/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch b/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch new file mode 100644 index 0000000..d6e499c --- /dev/null +++ b/common/recipes-extended/dpdk/dpdk/dpdk-1.6.0r2-examples-qos_sched-fix-makefile.patch @@ -0,0 +1,31 @@ +From ea9a59b26c3c86b498337e968ee8f68c4e263614 Mon Sep 17 00:00:00 2001 +From: Olivier Matz <olivier.m...@6wind.com> +Date: Fri, 16 May 2014 10:18:59 +0200 +Subject: [PATCH] examples/qos_sched: fix makefile + +The example does not compile as the linker complains about duplicated +symbols. + +Remove -lsched from LDLIBS, it is already present in rte.app.mk and +added by the DPDK framework automatically. + +Signed-off-by: Olivier Matz <olivier.m...@6wind.com> +Acked-by: Thomas Monjalon <thomas.monja...@6wind.com> +--- + examples/qos_sched/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile +index b91fe37..9366efe 100755 +--- a/examples/qos_sched/Makefile ++++ b/examples/qos_sched/Makefile +@@ -54,6 +54,4 @@ CFLAGS += $(WERROR_FLAGS) + CFLAGS_args.o := -D_GNU_SOURCE + CFLAGS_cfg_file.o := -D_GNU_SOURCE + +-LDLIBS += -lrte_sched +- + include $(RTE_SDK)/mk/rte.extapp.mk +-- +1.9.1 + -- 1.9.1 -- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel