On Mon, 2020-10-26 at 17:56 +0000, Adam D. Barratt wrote: > On Mon, 2020-10-26 at 15:18 +0000, Luca Boccassi wrote: > > On Sun, 2020-10-25 at 12:11 +0000, Luca Boccassi wrote: > > > On Sat, 24 Oct 2020 at 18:38, Adam D. Barratt < > > > a...@adam-barratt.org.uk> wrote: > [...] > > > > Unfortunately, this FTBFS on armhf (in three attempts across two > > > > different buildds): > [...] > > I found the issue, and I have a patch ready (a mainline commit was > > mistakenly not tagged for backport). Also found that the armv7 CI was > > disabled due to infra issues - I'll fix that too. > > Cool, thanks for the quick turnaround. > > > In terms of process, how do I proceed? A deb10u2 upload to stable? > > Yes, as the archive already contains ~deb10u1. > > > Do I need to create a new bug? > > As this is a build fix for the upload tracked by this bug, then > continuing to use this bug is fine in this instance. If it were a new > set of changes then it should be tracked in a separate bug. > > Please do attach an updated debdiff to this bug though. > > Regards, > > Adam
Uploaded and debdiff attached. Tested the build on the harris armhf porterbox. -- Kind regards, Luca Boccassi
diff -Nru dpdk-18.11.10/debian/changelog dpdk-18.11.10/debian/changelog --- dpdk-18.11.10/debian/changelog 2020-09-28 15:35:37.000000000 +0100 +++ dpdk-18.11.10/debian/changelog 2020-10-26 10:44:57.000000000 +0000 @@ -1,3 +1,9 @@ +dpdk (18.11.10-1~deb10u2) buster; urgency=medium + + * Backport patch to fix armhf build with NEON + + -- Luca Boccassi <bl...@debian.org> Mon, 26 Oct 2020 10:44:57 +0000 + dpdk (18.11.10-1~deb10u1) buster; urgency=medium * New upstream version 18.11.10 diff -Nru dpdk-18.11.10/debian/patches/0008-net-i40e-support-aarch32.patch dpdk-18.11.10/debian/patches/0008-net-i40e-support-aarch32.patch --- dpdk-18.11.10/debian/patches/0008-net-i40e-support-aarch32.patch 1970-01-01 01:00:00.000000000 +0100 +++ dpdk-18.11.10/debian/patches/0008-net-i40e-support-aarch32.patch 2020-10-26 10:44:57.000000000 +0000 @@ -0,0 +1,42 @@ +Author: Ruifeng Wang <ruifeng.w...@arm.com> +Origin: https://git.dpdk.org/dpdk/commit/?id=78bfe1666b2063e3fc3fa51e757159f53e1fc779 +Description: fix armhf build with NEON +--- a/config/defconfig_arm-armv7a-linuxapp-gcc ++++ b/config/defconfig_arm-armv7a-linuxapp-gcc +@@ -45,7 +45,6 @@ CONFIG_RTE_LIBRTE_CXGBE_PMD=n + CONFIG_RTE_LIBRTE_E1000_PMD=n + CONFIG_RTE_LIBRTE_ENIC_PMD=n + CONFIG_RTE_LIBRTE_FM10K_PMD=n +-CONFIG_RTE_LIBRTE_I40E_PMD=n + CONFIG_RTE_LIBRTE_IXGBE_PMD=n + CONFIG_RTE_LIBRTE_MLX4_PMD=n + CONFIG_RTE_LIBRTE_VMXNET3_PMD=n +--- a/drivers/net/i40e/Makefile ++++ b/drivers/net/i40e/Makefile +@@ -74,7 +74,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c + + SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c + SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c +-ifeq ($(CONFIG_RTE_ARCH_ARM64),y) ++ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) + SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c + else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) + SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c +--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c ++++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c +@@ -6,6 +6,7 @@ + #include <stdint.h> + #include <rte_ethdev_driver.h> + #include <rte_malloc.h> ++#include <rte_vect.h> + + #include "base/i40e_prototype.h" + #include "base/i40e_type.h" +@@ -13,7 +14,6 @@ + #include "i40e_rxtx.h" + #include "i40e_rxtx_vec_common.h" + +-#include <arm_neon.h> + + #pragma GCC diagnostic ignored "-Wcast-qual" + diff -Nru dpdk-18.11.10/debian/patches/series dpdk-18.11.10/debian/patches/series --- dpdk-18.11.10/debian/patches/series 2020-09-28 15:17:35.000000000 +0100 +++ dpdk-18.11.10/debian/patches/series 2020-10-26 10:44:37.000000000 +0000 @@ -2,3 +2,4 @@ 0005-build-use-dependency-instead-of-find_library.patch 0006-build-reorder-libraries-and-build-eal-before-cmdline.patch 0007-build-use-dependency-for-libbsd-instead-of-manual-ap.patch +0008-net-i40e-support-aarch32.patch
signature.asc
Description: This is a digitally signed message part
