[dpdk-stable] patch 'app/testpmd: remove double dependency on bitrate lib' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/12/21. 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.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/27dbdfd926d978628ba95e99a7d7a23915ed7c8b

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 27dbdfd926d978628ba95e99a7d7a23915ed7c8b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 5 Nov 2021 14:30:18 +0100
Subject: [PATCH] app/testpmd: remove double dependency on bitrate lib
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit fe629897def9ff5aa003a1a298df47239afb337f ]

No need for double dependency, once is enough.
While at it, sort alphabetically.

Fixes: fac83b3ef8ac ("app: fix missing dependencies")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 app/test-pmd/meson.build | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 7e9c7bdd69..4d584f7562 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -25,20 +25,21 @@ sources = files('5tswap.c',
 	'util.c')
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
-if dpdk_conf.has('RTE_LIB_BITRATESTATS')
-	deps += 'bitratestats'
-endif
-if dpdk_conf.has('RTE_LIB_PDUMP')
-	deps += 'pdump'
+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
+	deps += 'crypto_scheduler'
 endif
 if dpdk_conf.has('RTE_LIB_BITRATESTATS')
 	deps += 'bitratestats'
 endif
+if dpdk_conf.has('RTE_LIB_BPF')
+    sources += files('bpf_cmd.c')
+    deps += 'bpf'
+endif
 if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
 	deps += 'latencystats'
 endif
-if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
-	deps += 'crypto_scheduler'
+if dpdk_conf.has('RTE_LIB_PDUMP')
+	deps += 'pdump'
 endif
 if dpdk_conf.has('RTE_NET_BOND')
 	deps += 'net_bond'
@@ -55,7 +56,3 @@ endif
 if dpdk_conf.has('RTE_NET_DPAA')
 	deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
 endif
-if dpdk_conf.has('RTE_LIB_BPF')
-	sources += files('bpf_cmd.c')
-	deps += 'bpf'
-endif
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.503426726 +0800
+++ 0241-app-testpmd-remove-double-dependency-on-bitrate-lib.patch	2021-11-10 14:17:02.084077679 +0800
@@ -1 +1 @@
-From fe629897def9ff5aa003a1a298df47239afb337f Mon Sep 17 00:00:00 2001
+From 27dbdfd926d978628ba95e99a7d7a23915ed7c8b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fe629897def9ff5aa003a1a298df47239afb337f ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 21d50e92d0..b05c531c7f 100644
+index 7e9c7bdd69..4d584f7562 100644
@@ -22,2 +24,2 @@
-@@ -29,20 +29,21 @@ sources = files(
- )
+@@ -25,20 +25,21 @@ sources = files('5tswap.c',
+ 	'util.c')
@@ -25 +27 @@
- deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'bus_pci']
+ deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
@@ -27 +29 @@
--    deps += 'bitratestats'
+-	deps += 'bitratestats'
@@ -30 +32 @@
--    deps += 'pdump'
+-	deps += 'pdump'
@@ -32 +34 @@
-+    deps += 'crypto_scheduler'
++	deps += 'crypto_scheduler'
@@ -35 +37 @@
-     deps += 'bitratestats'
+ 	deps += 'bitratestats'
@@ -42 +44 @@
-     deps += 'latencystats'
+ 	deps += 'latencystats'
@@ -45 +47 @@
--    deps += 'crypto_scheduler'
+-	deps += 'crypto_scheduler'
@@ -47 +49 @@
-+    deps += 'pdump'
++	deps += 'pdump'
@@ -50,2 +52,2 @@
-     deps += 'net_bond'
-@@ -59,10 +60,6 @@ endif
+ 	deps += 'net_bond'
+@@ -55,7 +56,3 @@ endif
@@ -53 +55 @@
-     deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
+ 	deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
@@ -56,2 +58,2 @@
--    sources += files('bpf_cmd.c')
--    deps += 'bpf'
+-	sources += files('bpf_cmd.c')
+-	deps += 'bpf'
@@ -59,3 +60,0 @@
- jansson_dep = dependency('jansson', required: false, method: 'pkg-config')
- if jansson_dep.found()
-     dpdk_conf.set('RTE_HAS_JANSSON', 1)