From b43738020274b099ff492625e7ba4cb6ba3df6ff Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Wed, 18 Oct 2017 13:06:21 +0800 Subject: [PATCH] dpdk: update recipes *update to 3d7a6ae include the following changes 3d7a6ae - license: fix legal review request comments 148e3dc - Revert "crypto/openssl: fix compilation break with openssl 1.1" 9845264 - crypto/openssl: fix compilation break with openssl 1.1 95e380c - net/dpaa2: set queues if reconfiguration is done 64578fa - bus/dpaa: fix port order shuffling f58c470 - Merge pull request #451 in GITAM/dpdk from feature/DPDK-837 to 17.05-qoriq 7132562 - dpaa: Patch to fix coverity issue *remove 0001-fix-build-with-gcc-7.1.patch patches have beed applyed *remove load-devel-config.sh fix the below error |can't read load-devel-config.sh *Remove the commented code. *replace ${datadir}/tools with ${datadir}/* *replace /usr/bin with ${bindir} *replace /usr/sbin with ${sbindir} Signed-off-by: Chunrong Guo Signed-off-by: Otavio Salvador --- .../dpdk/0001-fix-build-with-gcc-7.1.patch | 119 ------------------ recipes-extended/dpdk/dpdk_16.07.bb | 8 +- 2 files changed, 2 insertions(+), 125 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch diff --git a/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch b/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch deleted file mode 100644 index 399510aa..00000000 --- a/recipes-extended/dpdk/dpdk/0001-fix-build-with-gcc-7.1.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 03ee26cd708971a51f056e3f53482367aa38fcb1 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo -Date: Wed, 12 Jul 2017 12:03:38 +0800 -Subject: [PATCH] fix build with gcc 7.1 - -Signed-off-by: Chunrong Guo ---- - lib/librte_cmdline/cmdline_parse_num.c | 4 ++-- - lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 2 +- - lib/librte_hash/rte_crc_arm64.h | 2 ++ - lib/librte_ring/rte_ring.h | 18 ++++++++++++------ - mk/toolchain/gcc/rte.vars.mk | 6 ++++++ - 5 files changed, 23 insertions(+), 9 deletions(-) - -diff --git a/lib/librte_cmdline/cmdline_parse_num.c b/lib/librte_cmdline/cmdline_parse_num.c -index b0f9a35..e507ec4 100644 ---- a/lib/librte_cmdline/cmdline_parse_num.c -+++ b/lib/librte_cmdline/cmdline_parse_num.c -@@ -250,7 +250,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, - - case HEX: - st = HEX_OK; -- /* no break */ -+ /* fall-through no break */ - case HEX_OK: - if (c >= '0' && c <= '9') { - if (add_to_res(c - '0', &res1, 16) < 0) -@@ -282,7 +282,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf, void *res, - - case BIN: - st = BIN_OK; -- /* no break */ -+ /* fall-through */ - case BIN_OK: - if (c >= '0' && c <= '1') { - if (add_to_res(c - '0', &res1, 2) < 0) -diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h -index e5554ca..8d76f32 100644 ---- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h -+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h -@@ -607,7 +607,7 @@ struct igb_adapter { - int int_mode; - u32 rss_queues; - u32 vmdq_pools; -- char fw_version[32]; -+ char fw_version[43]; - u32 wvbr; - struct igb_mac_addr *mac_table; - #ifdef CONFIG_IGB_VMDQ_NETDEV -diff --git a/lib/librte_hash/rte_crc_arm64.h b/lib/librte_hash/rte_crc_arm64.h -index 7dd6334..a17c0e4 100644 ---- a/lib/librte_hash/rte_crc_arm64.h -+++ b/lib/librte_hash/rte_crc_arm64.h -@@ -110,8 +110,10 @@ rte_hash_crc_set_alg(uint8_t alg) - case CRC32_ARM64: - if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32)) - alg = CRC32_SW; -+ /* fall-through */ - case CRC32_SW: - crc32_alg = alg; -+ /* fall-through */ - default: - break; - } -diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h -index 0e22e69..085f3fe 100644 ---- a/lib/librte_ring/rte_ring.h -+++ b/lib/librte_ring/rte_ring.h -@@ -364,9 +364,12 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); - r->ring[idx+3] = obj_table[i+3]; \ - } \ - switch (n & 0x3) { \ -- case 3: r->ring[idx++] = obj_table[i++]; \ -- case 2: r->ring[idx++] = obj_table[i++]; \ -- case 1: r->ring[idx++] = obj_table[i++]; \ -+ case 3: \ -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ -+ case 2: \ -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ -+ case 1: \ -+ r->ring[idx++] = obj_table[i++]; /* fallthrough */ \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++)\ -@@ -390,9 +393,12 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); - obj_table[i+3] = r->ring[idx+3]; \ - } \ - switch (n & 0x3) { \ -- case 3: obj_table[i++] = r->ring[idx++]; \ -- case 2: obj_table[i++] = r->ring[idx++]; \ -- case 1: obj_table[i++] = r->ring[idx++]; \ -+ case 3: \ -+ obj_table[i++] = r->ring[idx++]; /* fallthrough */ \ -+ case 2: \ -+ obj_table[i++] = r->ring[idx++]; /* fallthrough */ \ -+ case 1: \ -+ obj_table[i++] = r->ring[idx++]; /* fallthrough */ \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++) \ -diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk -index 94f6412..350c8bc 100644 ---- a/mk/toolchain/gcc/rte.vars.mk -+++ b/mk/toolchain/gcc/rte.vars.mk -@@ -101,5 +101,11 @@ ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) - WERROR_FLAGS += -Wno-uninitialized - endif - -+ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1) -+# Tell GCC only to error for switch fallthroughs without a suitable comment -+# Ignore errors for snprintf truncation -+WERROR_FLAGS += -Wno-format-truncation -+endif -+ - export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF - export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS --- -2.7.4 - diff --git a/recipes-extended/dpdk/dpdk_16.07.bb b/recipes-extended/dpdk/dpdk_16.07.bb index b47d041f..c825c3bb 100644 --- a/recipes-extended/dpdk/dpdk_16.07.bb +++ b/recipes-extended/dpdk/dpdk_16.07.bb @@ -12,9 +12,8 @@ inherit module SRC_URI = "git://github.com/qoriq-open-source/dpdk.git;nobranch=1 \ file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://0001-include-sys-sysmacros.h-for-major-minor-defintions.patch \ - file://0001-fix-build-with-gcc-7.1.patch \ " -SRCREV = "98f548c36b3c805a04d9963b8eb02e09340aa089" +SRCREV = "3d7a6ae1745a2f60f76afd3ad3ca57329388168c" S = "${WORKDIR}/git" @@ -23,7 +22,6 @@ DPAA_VER_fsl-lsch2 = "dpaa" export RTE_TARGET = "${ARCH}-${DPAA_VER}-linuxapp-gcc" export ETHTOOL_LIB_PATH = "${S}/examples/ethtool/lib/${RTE_TARGET}/" - EXTRA_OEMAKE += 'ARCH="${ARCH}" CROSS="${TARGET_PREFIX}" \ CPU_CFLAGS="--sysroot=${STAGING_DIR_HOST}" RTE_SDK="${S}" \ OPENSSL_PATH="${STAGING_DIR_HOST}" RTE_KERNELDIR="${STAGING_KERNEL_DIR}" \ @@ -55,8 +53,6 @@ do_install() { install -d ${D}/lib/modules/${KERNEL_VERSION}/dpdk install -m 0755 ${S}/${RTE_TARGET}/kmod/rte_kni.ko ${D}/lib/modules/${KERNEL_VERSION}/dpdk/ - sed -i 's#/bin/echo#/bin/bash#' ${D}/${datadir}/scripts/load-devel-config.sh - # rm ${S}/${RTE_TARGET}/app/dpdk-pmdinfogen rm ${D}/${datadir}/${RTE_TARGET}/app/dpdk-pmdinfogen chown root:root -R ${D} @@ -66,7 +62,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES += "${PN}-examples" -FILES_${PN} += "${datadir}/tools /usr/bin/* /usr/sbin/*" +FILES_${PN} += "${datadir}/* ${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${bindir}/dpdk-example/.debug \ ${datadir}/examples/kni/build/.debug \ ${datadir}/examples/kni/build/app/.debug \ -- 2.40.1