[dpdk-stable] patch 'devtools: fix orphan symbols check with busybox' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 18918e1884a3109e6f3c1fd8ca34a0a18d8da890 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 13 May 2021 10:34:13 +0200
Subject: [PATCH] devtools: fix orphan symbols check with busybox
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 71459555a6f8c88d3638fd857b810d4913a504e3 ]

Avoid relying on GNU grep --exclude option.

Fixes: f8ad40dc998c ("devtools: check orphan symbols in map files")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 devtools/check-symbol-maps.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devtools/check-symbol-maps.sh b/devtools/check-symbol-maps.sh
index 0e097eed89..e07682a479 100755
--- a/devtools/check-symbol-maps.sh
+++ b/devtools/check-symbol-maps.sh
@@ -20,8 +20,7 @@ find_orphan_symbols ()
             else
                 symsrc=$sym
             fi
-            if ! grep -q -r --exclude=$(basename $map) \
-                    -w $symsrc $(dirname $map) ; then
+            if [ -z "$(grep -rlw $symsrc $(dirname $map) | grep -v $map)" ] ; then
                 echo "$map: $sym"
             fi
         done
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:54:00.581363900 +0800
+++ 0159-devtools-fix-orphan-symbols-check-with-busybox.patch	2021-06-12 06:53:56.620000000 +0800
@@ -1 +1 @@
-From 71459555a6f8c88d3638fd857b810d4913a504e3 Mon Sep 17 00:00:00 2001
+From 18918e1884a3109e6f3c1fd8ca34a0a18d8da890 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 71459555a6f8c88d3638fd857b810d4913a504e3 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -17 +19 @@
-index f06353fc75..055db24472 100755
+index 0e097eed89..e07682a479 100755