From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C28B4A00E6 for ; Tue, 14 May 2019 16:45:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9F6D6904; Tue, 14 May 2019 16:45:05 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 1B3996904 for ; Tue, 14 May 2019 16:45:05 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86DFB8BD27 for ; Tue, 14 May 2019 14:45:04 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-124.ams2.redhat.com [10.36.116.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB5A1608B9; Tue, 14 May 2019 14:45:03 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Date: Tue, 14 May 2019 15:44:01 +0100 Message-Id: <20190514144406.7526-17-ktraynor@redhat.com> In-Reply-To: <20190514144406.7526-1-ktraynor@redhat.com> References: <20190514144406.7526-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 14 May 2019 14:45:04 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: fix check of symbol added as stable API' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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/20/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 are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/920f07edb9d0c6ac65cbd683f92e0ba30e09f7ff Thanks. Kevin Traynor --- >From 920f07edb9d0c6ac65cbd683f92e0ba30e09f7ff Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 3 May 2019 16:34:20 +0200 Subject: [PATCH] devtools: fix check of symbol added as stable API [ upstream commit af14b150df78ec46de919ae4a30efbefbcd44c95 ] The incriminated commit broke the detection of new symbols skipping the EXPERIMENTAL step before entering a stable ABI section. sed won't return an error, check a null output instead. Fixes: 3630757803ab ("devtools: accept experimental symbol promotion") Signed-off-by: David Marchand --- devtools/check-symbol-change.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh index cd59b8b5d..f6f79a883 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -111,13 +111,22 @@ check_for_rule_violations() # A symbol can not enter a non experimental # section directly - if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ] + if [ -z "$oldsecname" ] then - 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 + if [ "$secname" = 'EXPERIMENTAL' ] + then + echo -n "INFO: symbol $symname has " + echo -n "been added to the " + echo -n "EXPERIMENTAL section of the " + echo "version map" + continue + else + 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 fi -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-14 15:39:08.120438741 +0100 +++ 0017-devtools-fix-check-of-symbol-added-as-stable-API.patch 2019-05-14 15:39:07.313558811 +0100 @@ -1 +1 @@ -From af14b150df78ec46de919ae4a30efbefbcd44c95 Mon Sep 17 00:00:00 2001 +From 920f07edb9d0c6ac65cbd683f92e0ba30e09f7ff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit af14b150df78ec46de919ae4a30efbefbcd44c95 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 28f093a9f..c5434f3bb 100755 +index cd59b8b5d..f6f79a883 100755