From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 61CC8A034F for ; Mon, 22 Feb 2021 16:01:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F05C4003C; Mon, 22 Feb 2021 16:01:21 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 0A2404003C for ; Mon, 22 Feb 2021 16:01:20 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id r3so7768324wro.9 for ; Mon, 22 Feb 2021 07:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AVoH7pnpkvioAmLgXwsxKqBGmp7hVnqPuMyJWcxQDvw=; b=dbvvrATyMKEqeb2eihTKRweEREA+uNRx2/1+F5h97l2JfydedpqgKKQ7qy5mxqopRk bQufJs9plnK291b3Cor3vccuD1CcvD0jsaEWRtC3aczXmhIL7RNsfHDch85Mm7VKQW21 BRcarhrjdHqDiQKr0JxL26gUZAD7lxxng08NUTOI30eU7EYzmeyj0nT7R0qczZMI0a/+ caVoxqIwSTtKtvVsw1t0FPlDFJVhehvVNlQby6Bh24EFmUojJQNiWNlLL8LFgnjlipSA jaWmKEmI8X3g9ZofDh6sr/C3Qx5EU1rG9owRoxuOk8mQXsfEcQQTnotf/2Gmw+zlT3tW k0Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AVoH7pnpkvioAmLgXwsxKqBGmp7hVnqPuMyJWcxQDvw=; b=KhXIiiVm7R31F2ShFjEKf+3UxZEKAUCGX2BXe/jCnvGM+sIS6J9pY1Hlt7UDhHor6Z 1ioLG8ngwpZikCfbCRSKOcMh+CVetUZid+UsxeCSfjb5XZEGjyJ8o51ZTu74G+GYv1Sm xJwhPYN76/6oy0gwWiQsorVIYgxBQmd55sdHr3VI1Eo7Yxcri/+5If5d8drintH1MZEg S8Yt49BW0HFJpIshmYyAX6Hgzja1Q92tsLnBe2Ks/VgqSRvJzbVarqEJz5nk9GcE6zus Qq3aijxMJtrEdUqxCgNTVfb0+/UNZkJBset2Khghj+Qk1JGiMi0+cA5F71PWJH3CqIaS xT9w== X-Gm-Message-State: AOAM530ly8ZPbGdJyd5o4aZGP/aYdcH1l416fkfgD2HnjsdCtcJUhTBo GdywhFtvbk2ZtWSqE6vRa8vWK8IcNXk= X-Google-Smtp-Source: ABdhPJxEc7gU1gcOOpIe93y4aah+ssTPsgL/RYU3sTHhroAfeOF5VpE1Pa8cFYpkahhtBlumqmVhUQ== X-Received: by 2002:adf:e64b:: with SMTP id b11mr1281357wrn.272.1614006079420; Mon, 22 Feb 2021 07:01:19 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:7a8e:ed70:5c52:ea3]) by smtp.gmail.com with ESMTPSA id d15sm14586714wrb.43.2021.02.22.07.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 07:01:18 -0800 (PST) From: luca.boccassi@gmail.com To: stable@dpdk.org Cc: Luca Boccassi Date: Mon, 22 Feb 2021 15:01:14 +0000 Message-Id: <20210222150115.278569-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [scripts 1/2] 4-final-review: add support for VERSION file X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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" From: Luca Boccassi This script was still expecting to find the version in the rte_version.h header, but it's now a single file in the root of the repo --- 4-final-review | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/4-final-review b/4-final-review index c4fedb7..0444b1e 100755 --- a/4-final-review +++ b/4-final-review @@ -4,8 +4,26 @@ source ./lib.sh assert_current_branch -RTE_VER_RELEASE=$(awk '/#define RTE_VER_RELEASE/ { print $3 }' \ - $DPDK_DIR/lib/librte_eal/common/include/rte_version.h) +if [ -r "$DPDK_DIR/lib/librte_eal/include/rte_version.h" ]; then + VERSION_HEADER="$DPDK_DIR/lib/librte_eal/include/rte_version.h" +elif [ -r "$DPDK_DIR/lib/librte_eal/common/include/rte_version.h" ]; then + VERSION_HEADER="$DPDK_DIR/lib/librte_eal/common/include/rte_version.h" +else + echo "Cannot find rte_version.h" + exit 1 +fi + +if [ -e "$DPDK_DIR/VERSION" ]; then + if grep -q -F "rc" "$DPDK_DIR/VERSION"; then + RTE_VER_RELEASE=$(sed -E "s/.*rc(.*)/\1/" "$DPDK_DIR/VERSION") + else + RTE_VER_RELEASE=16 + fi +else + RTE_VER_RELEASE=$(awk '/#define RTE_VER_RELEASE/ { print $3 }' \ + ${VERSION_HEADER}) +fi + [ $RTE_VER_RELEASE -eq 16 ] && { RTE_VER_RELEASE=1 } || { @@ -17,11 +35,11 @@ stable_release_rc="${stable_release}-rc${RTE_VER_RELEASE}" change_version() { sed "s/#define RTE_VER_MINOR [0-9]*/#define RTE_VER_MINOR ${RTE_VER_MINOR}/" \ - -i $DPDK_DIR/lib/librte_eal/common/include/rte_version.h + -i ${VERSION_HEADER} sed 's/#define RTE_VER_SUFFIX .*/#define RTE_VER_SUFFIX "-rc"/' \ - -i $DPDK_DIR/lib/librte_eal/common/include/rte_version.h + -i ${VERSION_HEADER} sed "s/#define RTE_VER_RELEASE .*/#define RTE_VER_RELEASE ${RTE_VER_RELEASE}/" \ - -i $DPDK_DIR/lib/librte_eal/common/include/rte_version.h + -i ${VERSION_HEADER} if [ -e $DPDK_DIR/pkg/dpdk.spec ]; then sed "s/Version: .*/Version: ${stable_release_rc}/" -i $DPDK_DIR/pkg/dpdk.spec fi -- 2.29.2