[dpdk-stable] patch 'devtools: accept experimental symbol promotion' has been queued to LTS release 18.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.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 05/07/19. 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 can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8c10f57a0c8d949d0639c45665207bce0da77f5b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 5 Apr 2019 10:17:47 +0200
Subject: [PATCH] devtools: accept experimental symbol promotion

[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]

Currently, when symbols get promoted from the EXPERIMENTAL section to a
stable ABI section, the script complains they should go to the
EXPERIMENTAL section.

Example:
ERROR: symbol rte_devargs_add is added in the DPDK_19.05 section, but is
expected to be added in the EXPERIMENTAL section of the version map

This is legit.
Moving from a stable ABI to another is also allowed, but must have gone
through the proper process.

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

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 8f986a5d7..40eb95322 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -106,24 +106,35 @@ check_for_rule_violations()
 			fi
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			oldsecname=$(sed -n \
+			"s#$mname $symname \(.*\) del#\1#p" "$mapdb")
+
+			# A symbol can not enter a non experimental
+			# section directly
+			if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ]
 			then
-				# Symbols that are getting added in a section
-				# other than the experimental section
-				# to be moving from an already supported
-				# section or its a violation
-				grep -q \
-				"$mname $symname [^EXPERIMENTAL] del" "$mapdb"
-				if [ $? -ne 0 ]
-				then
-					echo -n "ERROR: symbol $symname "
-					echo -n "is added in a section "
-					echo -n "other than the EXPERIMENTAL "
-					echo "section of the version map"
-					ret=1
-				fi
+				echo -n "ERROR: symbol $symname "
+				echo -n "is added in the $secname "
+				echo -n "section, but is expected to "
+				echo -n "be added in the EXPERIMENTAL "
+				echo "section of the version map"
+				ret=1
+				continue
+			fi
+
+			# This symbol is moving between two sections (the
+			# original section is not experimental).
+			# This can be legit, just warn.
+			if [ "$oldsecname" != 'EXPERIMENTAL' ]
+			then
+				echo -n "INFO: symbol $symname is being "
+				echo -n "moved from $oldsecname to $secname. "
+				echo -n "Ensure that it has gone through the "
+				echo "deprecation process"
+				continue
 			fi
 		else
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			if ! grep -q "$mname $symname .* add" "$mapdb" && \
+			   [ "$secname" != "EXPERIMENTAL" ]
 			then
 				# Just inform users that non-experimenal
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.860604760 +0100
+++ 0022-devtools-accept-experimental-symbol-promotion.patch	2019-04-30 17:58:13.799139943 +0100
@@ -1 +1 @@
-From 3630757803ab2f914ab36bb0285b662b3cff50db Mon Sep 17 00:00:00 2001
+From 8c10f57a0c8d949d0639c45665207bce0da77f5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -24,2 +25,2 @@
- devtools/check-symbol-change.sh | 44 ++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 17 deletions(-)
+ devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
+ 1 file changed, 27 insertions(+), 16 deletions(-)
@@ -28 +29 @@
-index 020da7ed0..40eb95322 100755
+index 8f986a5d7..40eb95322 100755
@@ -31 +32 @@
-@@ -106,25 +106,35 @@ check_for_rule_violations()
+@@ -106,24 +106,35 @@ check_for_rule_violations()
@@ -51,3 +52,2 @@
--					echo -n "is added in the $secname "
--					echo -n "section, but is expected to "
--					echo -n "be added in the EXPERIMENTAL "
+-					echo -n "is added in a section "
+-					echo -n "other than the EXPERIMENTAL "