patch 'devtools: fix symbols check' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Thu Mar 10 13:11:27 CET 2022


Hi,

FYI, your patch has been queued to stable release 21.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 03/14/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/efd091d5417b702cd63845ab99bd66da39dcdd1d

Thanks.

Kevin

---
>From efd091d5417b702cd63845ab99bd66da39dcdd1d Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 8 Mar 2022 22:02:48 +0100
Subject: [PATCH] devtools: fix symbols check

[ upstream commit 272f94e58b01a904b5d8cf66649512b0d62f1a8c ]

In some environments, the check of local symbols catch-all
was failing. Note: this script is called during the build.

The reason is that grep returns an error if nothing is found.
The option -e of the shell script makes this error fatal.
It is not always fatal because the grep is in a command substitution.

Fixes: b403498e1422 ("build: hide local symbols in shared libraries")

Reported-by: Usama Arif <usama.arif at bytedance.com>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 devtools/check-symbol-maps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/check-symbol-maps.sh b/devtools/check-symbol-maps.sh
index 8266fdf9ea..32e1fa5c8f 100755
--- a/devtools/check-symbol-maps.sh
+++ b/devtools/check-symbol-maps.sh
@@ -54,5 +54,5 @@ if [ -n "$duplicate_symbols" ] ; then
 fi
 
-local_miss_maps=$(grep -L 'local: \*;' $@)
+local_miss_maps=$(grep -L 'local: \*;' $@ || true)
 if [ -n "$local_miss_maps" ] ; then
     echo "Found maps without local catch-all:"
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-10 12:05:32.004827182 +0000
+++ 0028-devtools-fix-symbols-check.patch	2022-03-10 12:05:31.323630914 +0000
@@ -1 +1 @@
-From 272f94e58b01a904b5d8cf66649512b0d62f1a8c Mon Sep 17 00:00:00 2001
+From efd091d5417b702cd63845ab99bd66da39dcdd1d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,2 @@
+
+[ upstream commit 272f94e58b01a904b5d8cf66649512b0d62f1a8c ]



More information about the stable mailing list