From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by dpdk.org (Postfix) with ESMTP id 7EC28160 for ; Mon, 8 Oct 2018 11:02:28 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 143-v6so7296000wmf.1 for ; Mon, 08 Oct 2018 02:02:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:content-transfer-encoding:mime-version; bh=HiASzUm7ldMOz7WW2HOQa3XeDKTJhKmOL/lxZc0AxmQ=; b=BXJg6eNou8EAIwBZCAAmud6DiRDNox/9x9fG95Y1uIIIG1kVmRJgEV0ABRVz0x0EzG uth2I8OwzIO5I04c+11RYDU96mJhqp2DkAjyZ/uWGRAw1q7q/cRtUXBsO9DiAcqWJ5PB q1kiXK5eYhelMOXDwGMWaYTqLKOvjciViTbXZsZ3EQI7kwMr3OwjNbLXp414FAdJ59l4 +u4eVywzKuoiDEPOFfgzgWCL2uDpYDugkekoRydwsceYasEYLDYZQI7IU/PyxQ8vXaod th576dGWMs9W1gilKanCq7uQTnIPy9xq1dtnOtc2V4iiAvmYp/n/oemnC4R8/0CDXAok cvmA== X-Gm-Message-State: ABuFfoiwrnZ/ptYPvriyST5fd3Ox2WGk9fKciNSbhgpraQqOhHszcqJw GgAG1YZsEGc7ao8pfoM5K7FBew4w X-Google-Smtp-Source: ACcGV60+9adfR0vsvLkq04iNRP4WCSpduGp1Y4Q48KaCJp5jQAh0hyyTpVhH0Vm/KFjecAiGF4rWSw== X-Received: by 2002:a1c:f010:: with SMTP id a16-v6mr13703432wmb.5.1538989347481; Mon, 08 Oct 2018 02:02:27 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id h13-v6sm1351190wrr.73.2018.10.08.02.02.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Oct 2018 02:02:26 -0700 (PDT) Message-ID: <1538989345.8721.19.camel@debian.org> From: Luca Boccassi To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, yskoh@mellanox.com, ktraynor@redhat.com Date: Mon, 08 Oct 2018 10:02:25 +0100 In-Reply-To: <20180925123610.25087-1-bluca@debian.org> References: <20180917180727.21974-1-bluca@debian.org> <20180925123610.25087-1-bluca@debian.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Subject: Re: [dpdk-stable] [RFC stable-scripts v2] 1-import: don't filter commits for later releases that fix backported patches 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: , X-List-Received-Date: Mon, 08 Oct 2018 09:02:28 -0000 On Tue, 2018-09-25 at 13:36 +0100, Luca Boccassi wrote: > A patch might fix a commit in a later release and so it is skipped. > But > that commit might have been backported in the past, so skipping the > patch is wrong. > Rework the list pruning to take this case into account. >=20 > Signed-off-by: Luca Boccassi > --- > v2: create $stable_release directory in case it's not already there > =C2=A0=C2=A0=C2=A0=C2=A0(first round of backporting) >=20 > =C2=A01-import | 40 +++++++++++++++++++++++++++++----------- > =C2=A01 file changed, 29 insertions(+), 11 deletions(-) >=20 > diff --git a/1-import b/1-import > index 05dfdf0..497c0ae 100755 > --- a/1-import > +++ b/1-import > @@ -28,18 +28,36 @@ import_one_commit() > =C2=A0if [ "$PRUNE_COMMITS" =3D "yes" ] > =C2=A0then > =C2=A0 get_stable_release > - # need to update it in 2021! > - for _major in {16..20} > + tmp_list=3D$PWD/$stable_release/tmp_list > + rm -f $tmp_list > + mkdir -p $PWD/$stable_release > + > + pushd $STABLE_DIR &>/dev/null > + log=3D$($GIT log v${RTE_VER_MAJOR}..v$last_release) > + while read line > =C2=A0 do > - for _minor in {02..11..3} > - do > - if verlte $stable_release $_major.$_minor > - then > - sed -i "/($_major.$_minor > (partially.*\$/d" $commit_list > - sed -i "/($_major.$_minor)\$/d" > $commit_list > - fi > - done > - done > + # Get the id of the commit being fixed, for the > first check > + id=3D$(echo $line | awk '{print $2}') > + fixes=3D$($GIT log --format=3D'%b' -1 $id | sed -n 's,^ > *\([Ff]ixes\|[Rr]everts\): *\([0-9a-f]*\).*,\2,p') > + > + # Was stable CC'ed without a Fixes line? If so > select it just in case > + if echo $line | grep -q "(N/A)" > + then > + echo $line >> $tmp_list > + # Is the patch fixing a commit that was part of this > stable release? > + # If so select it > + elif verlte `echo $line | sed "s/.*(\([0-9][0-9].[0- > 9][0-9]\).*)/\1/"` $stable_release > + then > + echo $line >> $tmp_list > + # Was the commit (which might be only in a > subsequent release) > + # that the patch "fixes" backported? If so select it > + elif test -n fixes && echo $log | grep -q -e > "backported from commit $fixes" -e "upstream commit $fixes" > + then > + echo $line >> $tmp_list > + fi > + done < $commit_list > + popd &>/dev/null > + mv $tmp_list $commit_list > =C2=A0fi > =C2=A0 > =C2=A0if [ "$GIT_AM_PAUSE_ON_FAIL" =3D "yes" ] Ping - any chance of a review? --=20 Kind regards, Luca Boccassi