From 5a5f4676eb93fa410b56df060a6d0c7603469f81 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Thu, 1 Nov 2018 09:54:10 -0400 Subject: [PATCH] devtools: fix regex in symbol addition check 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@bu.edu Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") Cc: stable@dpdk.org Reported-by: Cody Doucette Signed-off-by: Neil Horman --- 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 c0d2a6da18..1d21e91654 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -23,7 +23,7 @@ build_map_changes() # does not end in 'map', indicating we have left the map chunk. # 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 # with a { identifies a versioned section. The section name is @@ -153,7 +153,6 @@ clean_and_exit_on_sig() build_map_changes "$patch" "$mapfile" check_for_rule_violations "$mapfile" exit_code=$? - rm -f "$mapfile" exit $exit_code -- 2.20.1