[dpdk-stable] patch 'devtools: fix regex in symbol addition check' has been queued to stable release 18.08.1

Kevin Traynor ktraynor at redhat.com
Thu Nov 29 14:21:02 CET 2018


Hi,

FYI, your patch has been queued to stable release 18.08.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 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 947cfe55d758c6012761bc5c06a44dc6e531540d Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman at tuxdriver.com>
Date: Thu, 1 Nov 2018 09:54:10 -0400
Subject: [PATCH] devtools: fix regex in symbol addition check

[ upstream commit 5a5f4676eb93fa410b56df060a6d0c7603469f81 ]

The regex to determine the end of the map file chunk in a patch seems to
be wrong,  It was using perl regex syntax, which awk doesn't appear to
support (I'm still not sure how it was working previously).  Regardless,
it wasn't triggering and as a result symbols were getting added to the
mapdb that shouldn't be there.

Fix it by converting the regex to use traditional posix syntax, matching
only on the negation of the character class [^map]

Tested and shown to be working on the ip_frag patch set provided by
doucette at bu.edu

Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition")

Reported-by: Cody Doucette <doucette at bu.edu>
Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
---
 devtools/check-symbol-change.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index cf9cfc745..9fb214dc0 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -24,5 +24,5 @@ build_map_changes()
 		# When we hit this, turn off the in_map variable, which
 		# supresses the subordonate rules below
-		/[-+] a\/.*\.^(map)/ {in_map=0}
+		/[-+] a\/.*\.[^map]/ {in_map=0}
 
 		# Triggering this rule, which starts a line and ends it
@@ -154,5 +154,4 @@ build_map_changes "$patch" "$mapfile"
 check_for_rule_violations "$mapfile"
 exit_code=$?
-
 rm -f "$mapfile"
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:36.603235041 +0000
+++ 0061-devtools-fix-regex-in-symbol-addition-check.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,8 +1,10 @@
-From 5a5f4676eb93fa410b56df060a6d0c7603469f81 Mon Sep 17 00:00:00 2001
+From 947cfe55d758c6012761bc5c06a44dc6e531540d Mon Sep 17 00:00:00 2001
 From: Neil Horman <nhorman at tuxdriver.com>
 Date: Thu, 1 Nov 2018 09:54:10 -0400
 Subject: [PATCH] devtools: fix regex in symbol addition check
 
+[ upstream commit 5a5f4676eb93fa410b56df060a6d0c7603469f81 ]
+
 The regex to determine the end of the map file chunk in a patch seems to
 be wrong,  It was using perl regex syntax, which awk doesn't appear to
 support (I'm still not sure how it was working previously).  Regardless,
@@ -16,7 +18,6 @@
 doucette at bu.edu
 
 Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition")
-Cc: stable at dpdk.org
 
 Reported-by: Cody Doucette <doucette at bu.edu>
 Signed-off-by: Neil Horman <nhorman at tuxdriver.com>
@@ -25,7 +26,7 @@
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
-index c0d2a6da1..1d21e9165 100755
+index cf9cfc745..9fb214dc0 100755
 --- a/devtools/check-symbol-change.sh
 +++ b/devtools/check-symbol-change.sh
 @@ -24,5 +24,5 @@ build_map_changes()


More information about the stable mailing list