From 39815f5ec283f4fbfc1a891ebd510bc11b657d3f Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 4 Jul 2019 11:03:19 +0200 Subject: - drop changes upstream in 18.11.2 0002-build-use-generic-march-on-arm64-when-using-default.patch lp-1827102-kni-fix-build-with-Linux-5.1.patch Change-Id: Ifc37f91b203b872a3f4b5b5b475ea3bb561aa511 Signed-off-by: Christian Ehrhardt --- ...generic-march-on-arm64-when-using-default.patch | 31 --------- .../lp-1827102-kni-fix-build-with-Linux-5.1.patch | 73 ---------------------- debian/patches/series | 2 - 3 files changed, 106 deletions(-) delete mode 100644 debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch delete mode 100644 debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch diff --git a/debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch b/debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch deleted file mode 100644 index 3f1b10d4..00000000 --- a/debian/patches/0002-build-use-generic-march-on-arm64-when-using-default.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: use generic march on arm64 when using 'default' machine - When building for generic distribution we need a stable baseline - architecture, or depending on the build worker the result will vary. - - Force the default flags if the user explicitly sets marchine=default - at configuration time. -Author: Luca Boccassi -Forwarded: https://patches.dpdk.org/patch/49259/ ---- a/config/arm/meson.build -+++ b/config/arm/meson.build -@@ -6,6 +6,7 @@ - march_opt = '-march=@0@'.format(machine) - - arm_force_native_march = false -+arm_force_default_march = machine == 'default' - - machine_args_generic = [ - ['default', ['-march=armv8-a+crc+crypto']], -@@ -102,7 +103,11 @@ else - cmd_generic = ['generic', '', '', 'default', ''] - cmd_output = cmd_generic # Set generic by default - machine_args = [] # Clear previous machine args -- if not meson.is_cross_build() -+ if arm_force_default_march and not meson.is_cross_build() -+ machine = impl_generic -+ cmd_output = cmd_generic -+ impl_pn = 'default' -+ elif not meson.is_cross_build() - # The script returns ['Implementer', 'Variant', 'Architecture', - # 'Primary Part number', 'Revision'] - detect_vendor = find_program(join_paths( diff --git a/debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch b/debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch deleted file mode 100644 index c06448a7..00000000 --- a/debian/patches/lp-1827102-kni-fix-build-with-Linux-5.1.patch +++ /dev/null @@ -1,73 +0,0 @@ -From db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 Mon Sep 17 00:00:00 2001 -From: Ferruh Yigit -Date: Mon, 8 Apr 2019 15:22:26 +0100 -Subject: [PATCH] kni: fix build with Linux 5.1 - -Build error seen with Linux kernel 5.1 and -when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled. - -Build error: -kernel/linux/kni/igb_main.c:2352:18: - error: initialization of ... from incompatible pointer type ... - [-Werror=incompatible-pointer-types] - .ndo_fdb_add = igb_ndo_fdb_add, - ^~~~~~~~~~~~~~~ - -ndo_fdb_add() is changed in Linux kernel version 5.1 and now requires -a new parameter, 'struct netlink_ext_ack *extack': -Linux Commit 87b0984ebfab ("net: Add extack argument to ndo_fdb_add()") - -ndo_fdb_add() parameter updated with compile time Linux kernel version -check. - -Cc: stable@dpdk.org - -Signed-off-by: Ferruh Yigit -Tested-by: Bruce Richardson -Reviewed-by: Rami Rosen - -Origin: upstream, https://git.dpdk.org/dpdk/commit/?id=db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1827102 -Last-Update: 2019-05-03 - ---- - kernel/linux/kni/ethtool/igb/igb_main.c | 6 ++++++ - kernel/linux/kni/ethtool/igb/kcompat.h | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c -index 0b4faeae5..cda2b063d 100644 ---- a/kernel/linux/kni/ethtool/igb/igb_main.c -+++ b/kernel/linux/kni/ethtool/igb/igb_main.c -@@ -2112,7 +2112,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], - #ifdef HAVE_NDO_FDB_ADD_VID - u16 vid, - #endif -+#ifdef HAVE_NDO_FDB_ADD_EXTACK -+ u16 flags, -+ struct netlink_ext_ack *extack) -+#else - u16 flags) -+#endif -+ - #else - static int igb_ndo_fdb_add(struct ndmsg *ndm, - struct net_device *dev, -diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h -index 11b15f3a9..649a69c81 100644 ---- a/kernel/linux/kni/ethtool/igb/kcompat.h -+++ b/kernel/linux/kni/ethtool/igb/kcompat.h -@@ -3945,6 +3945,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) - #define HAVE_NDO_BRIDGE_SETLINK_EXTACK - #endif /* >= 5.0.0 */ - -+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) ) -+#define HAVE_NDO_FDB_ADD_EXTACK -+#endif /* >= 5.1.0 */ -+ - #if defined(timer_setup) && defined(from_timer) - #define HAVE_TIMER_SETUP - #endif --- -2.21.0 - diff --git a/debian/patches/series b/debian/patches/series index 7f8ef44a..b7563f37 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ -0002-build-use-generic-march-on-arm64-when-using-default.patch 0004-build-bump-minimum-Meson-version-to-0.47.1.patch 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 -lp-1827102-kni-fix-build-with-Linux-5.1.patch -- cgit 1.2.3-korg