From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 1B7B129C6 for ; Tue, 20 Nov 2018 20:13:04 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30CEA4E938; Tue, 20 Nov 2018 19:13:03 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1AC0F600C3; Tue, 20 Nov 2018 19:13:00 +0000 (UTC) From: Kevin Traynor To: Neil Horman Cc: Nikhil Rao , dpdk stable Date: Tue, 20 Nov 2018 19:11:51 +0000 Message-Id: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 20 Nov 2018 19:13:03 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: relax rule for identifying symbol section' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 19:13:04 -0000 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 11/23/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 fa1b0fa75a272dacd6b1c2298d5cc72a64a01471 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Thu, 16 Aug 2018 07:08:01 -0400 Subject: [PATCH] devtools: relax rule for identifying symbol section [ upstream commit 7281cf520f890a5e779596c872e2440af7131eae ] It was reported recently that some patches that add symbols to an existing EXPERIMENTAL section of a version map file generate errors because the check-symbol-change script was identifying the section as "@@" rather than EXPERIMENTAL. This was fairly clearly due to the fact that the rule identifying the version section expected the whole section to be added, rather than having it already exist, with only new symbols being added to the existing section. This led the match rule to misread the format of that line and pull the wrong word out of it. The fix is to relax the rule slightly. Rather than assume that the section must exist on a line that was added, allow the section name to be set by any line that ends in a '{', which should be correct, given our coding practices. The section name is then extracted as the next to the last word on the line ( $(NF-1) ). Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") Reported-by: Nikhil Rao Signed-off-by: Neil Horman Tested-by: Nikhil Rao --- devtools/check-symbol-change.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index daaf45e14..cf9cfc745 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -26,12 +26,12 @@ build_map_changes() /[-+] a\/.*\.^(map)/ {in_map=0} - # Triggering this rule, which starts a line with a + and ends it + # Triggering this rule, which starts a line and ends it # with a { identifies a versioned section. The section name is # the rest of the line with the + and { symbols remvoed. # Triggering this rule sets in_sec to 1, which actives the # symbol rule below - /+.*{/ {gsub("+",""); + /^.*{/ { if (in_map == 1) { - sec=$1; in_sec=1; + sec=$(NF-1); in_sec=1; } } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:07.509182348 +0000 +++ 0001-devtools-relax-rule-for-identifying-symbol-section.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,8 +1,10 @@ -From 7281cf520f890a5e779596c872e2440af7131eae Mon Sep 17 00:00:00 2001 +From fa1b0fa75a272dacd6b1c2298d5cc72a64a01471 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Thu, 16 Aug 2018 07:08:01 -0400 Subject: [PATCH] devtools: relax rule for identifying symbol section +[ upstream commit 7281cf520f890a5e779596c872e2440af7131eae ] + It was reported recently that some patches that add symbols to an existing EXPERIMENTAL section of a version map file generate errors because the check-symbol-change script was identifying the section as @@ -19,7 +21,6 @@ the last word on the line ( $(NF-1) ). Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition") -Cc: stable@dpdk.org Reported-by: Nikhil Rao Signed-off-by: Neil Horman