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 2ED81A0AC5 for ; Fri, 3 May 2019 16:34:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 10F267D05; Fri, 3 May 2019 16:34:45 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id DD04C5F1F; Fri, 3 May 2019 16:34:39 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2E7DA307E048; Fri, 3 May 2019 14:34:37 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.205.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1ECA5C6B5; Fri, 3 May 2019 14:34:35 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, nhorman@tuxdriver.com, stable@dpdk.org Date: Fri, 3 May 2019 16:34:20 +0200 Message-Id: <1556894060-13573-4-git-send-email-david.marchand@redhat.com> In-Reply-To: <1556894060-13573-1-git-send-email-david.marchand@redhat.com> References: <1556894060-13573-1-git-send-email-david.marchand@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 03 May 2019 14:34:39 +0000 (UTC) Subject: [dpdk-stable] [PATCH 4/4] devtools: fix direct additions to stable API 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" 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") Cc: stable@dpdk.org 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 9ada81e..116c311 100755 --- a/devtools/check-symbol-change.sh +++ b/devtools/check-symbol-change.sh @@ -111,15 +111,24 @@ 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 # This symbol is moving inside a section, nothing to do -- 1.8.3.1