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 0DC8FA034F for ; Mon, 22 Feb 2021 16:12:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F39284003C; Mon, 22 Feb 2021 16:12:45 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D6A424003C for ; Mon, 22 Feb 2021 16:12:44 +0100 (CET) Received: from mail-qt1-f198.google.com ([209.85.160.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lECtA-0007So-K1 for stable@dpdk.org; Mon, 22 Feb 2021 15:12:44 +0000 Received: by mail-qt1-f198.google.com with SMTP id r1so462062qtu.9 for ; Mon, 22 Feb 2021 07:12:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=dlOgCNF62Z0LRIhGoAvGsi9OUJ8bz8QQgZugAHS8kmU=; b=nyDo5o4TUfbCtxr1VqNifixR4iprRWFowPKS4gmx+aXG2stkVt+aUazqEOe6E6QtPP nyeUbJYFJUBwwDK2IRNCFpPMQ5GDuKlIHbP/c1WFrldECBYVBVuCrNVpxIBaCDL8fjFo DBxo582okfQKJRyJ07x5D2SydHpi+SLdKElk6T+OrKtE4V6bcNfRCS/IPSFruzqTgFl2 7rGFJGhjJkA3+Wvqgspwh+JnsKzUV1RerRli5nVnA4SVUXvVHEd7cz7PwRcPoAspFd/E PyinXRzyKTTjBXTHUggXMIrZSax5uvKW5gqOGqEfzRbA+ejaLHJ5bovJ50ZgtIOkSRBS bxTQ== X-Gm-Message-State: AOAM530pOrn7vjPDZPo/eRSvByk4seQ+qFWtV8MH5NHtBsyswR5UV5gb Lz7sv5UeongFRoxkixqMKrplLG7WWTFw+Yv9zCPMzunquGjJ1GZWQnBX/c5K3/uLP7apRlHXlXe UReFUiLMoolMeq+32MzomWRrOZaSC91qb4GzkzB1u X-Received: by 2002:a05:622a:93:: with SMTP id o19mr20626069qtw.336.1614006763059; Mon, 22 Feb 2021 07:12:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzC1sBxosd63CmxmKVgX2zf5qlD+lF4cOvbPq3iVGk8Z7494TPvvzlike2ELYOLddyWOKG/rZzV3Zoqr0V0NMA= X-Received: by 2002:a05:622a:93:: with SMTP id o19mr20626051qtw.336.1614006762788; Mon, 22 Feb 2021 07:12:42 -0800 (PST) MIME-Version: 1.0 References: <20210222150115.278569-1-luca.boccassi@gmail.com> In-Reply-To: <20210222150115.278569-1-luca.boccassi@gmail.com> From: Christian Ehrhardt Date: Mon, 22 Feb 2021 16:12:16 +0100 Message-ID: To: Luca Boccassi Cc: dpdk stable , Luca Boccassi Content-Type: text/plain; charset="UTF-8" Subject: Re: [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" On Mon, Feb 22, 2021 at 4:01 PM wrote: > > 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(-) Acked-by: Christian Ehrhardt > > 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 > -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd