[dpdk-stable] patch 'net/ipn3ke: fix meson build' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From ea1e97addf528d6749741e8eaf60ee3fec9cbc74 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 12 Dec 2019 17:28:43 +0000
Subject: [PATCH] net/ipn3ke: fix meson build

[ upstream commit 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 ]

The ipn3ke driver and the ifpga driver had circular dependencies on each
other, meaning that neither could be built with meson. Fix this by:

* setting the build order of net and raw to match that in makefiles
* removing the dependency from the net driver on the rawdev one
* fixing the dependency names in the rawdev driver meson.build file

Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port bonding")
Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Rosen Xu <rosen.xu at intel.com>
---
 drivers/meson.build            | 4 ++--
 drivers/net/ipn3ke/meson.build | 4 +++-
 drivers/raw/ifpga/meson.build  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/meson.build b/drivers/meson.build
index 72eec46088..32d68aa1d0 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -9,8 +9,8 @@ endif
 dpdk_driver_classes = ['common',
 	       'bus',
 	       'mempool', # depends on common and bus.
-	       'raw',     # depends on common and bus.
-	       'net',     # depends on common, bus, mempool and raw.
+	       'net',     # depends on common, bus, mempool
+	       'raw',     # depends on common, bus and net.
 	       'crypto',  # depends on common, bus and mempool (net in future).
 	       'compress', # depends on common, bus, mempool.
 	       'event',   # depends on common, bus, mempool and net.
diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
index e3c8a6768c..bfec592aba 100644
--- a/drivers/net/ipn3ke/meson.build
+++ b/drivers/net/ipn3ke/meson.build
@@ -21,9 +21,11 @@ endif
 if build
 	allow_experimental_apis = true
 
+	includes += include_directories('../../raw/ifpga')
+
 	sources += files('ipn3ke_ethdev.c',
 		'ipn3ke_representor.c',
 		'ipn3ke_tm.c',
 		'ipn3ke_flow.c')
-	deps += ['bus_ifpga', 'sched', 'pmd_i40e', 'rawdev', 'rawdev_ifpga']
+	deps += ['bus_ifpga', 'ethdev', 'sched']
 endif
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 206136ff48..d4027068d6 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -15,7 +15,7 @@ if build
 	objs = [base_objs]
 
 	deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
-		'bus_vdev', 'bus_ifpga', 'net', 'i40e', 'ipn3ke']
+		'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke']
 	ext_deps += dep
 
 	sources = files('ifpga_rawdev.c')
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:40.234853543 +0000
+++ 0031-net-ipn3ke-fix-meson-build.patch	2020-02-11 11:17:38.344000300 +0000
@@ -1,8 +1,10 @@
-From 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 Mon Sep 17 00:00:00 2001
+From ea1e97addf528d6749741e8eaf60ee3fec9cbc74 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Thu, 12 Dec 2019 17:28:43 +0000
 Subject: [PATCH] net/ipn3ke: fix meson build
 
+[ upstream commit 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 ]
+
 The ipn3ke driver and the ifpga driver had circular dependencies on each
 other, meaning that neither could be built with meson. Fix this by:
 
@@ -12,7 +14,6 @@
 
 Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port bonding")
 Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Rosen Xu <rosen.xu at intel.com>
@@ -23,7 +24,7 @@
  3 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/meson.build b/drivers/meson.build
-index 3f8749d0b7..29708cc2bb 100644
+index 72eec46088..32d68aa1d0 100644
 --- a/drivers/meson.build
 +++ b/drivers/meson.build
 @@ -9,8 +9,8 @@ endif
@@ -36,7 +37,7 @@
 +	       'raw',     # depends on common, bus and net.
  	       'crypto',  # depends on common, bus and mempool (net in future).
  	       'compress', # depends on common, bus, mempool.
- 	       'vdpa',    # depends on common, bus and mempool.
+ 	       'event',   # depends on common, bus, mempool and net.
 diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
 index e3c8a6768c..bfec592aba 100644
 --- a/drivers/net/ipn3ke/meson.build