From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1572F1586A6 for ; Tue, 17 Aug 2021 20:47:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A04FE0871; Tue, 17 Aug 2021 20:47:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E0BCE0871 for ; Tue, 17 Aug 2021 20:47:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 220493407E6 for ; Tue, 17 Aug 2021 20:47:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82EE37BD for ; Tue, 17 Aug 2021 20:47:38 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1629233230.1f8e02859a351250c9ba3999b0aae28abb259641.dilfridge@gentoo> Subject: [gentoo-commits] proj/toolchain/binutils-patches:master commit in: / X-VCS-Repository: proj/toolchain/binutils-patches X-VCS-Files: make-tarball.sh X-VCS-Directories: / X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 1f8e02859a351250c9ba3999b0aae28abb259641 X-VCS-Branch: master Date: Tue, 17 Aug 2021 20:47:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 59d74e8b-5462-4e62-981c-6af9b85c5e20 X-Archives-Hash: 195bfc1d08afbdd9c4c574f779f1aa69 commit: 1f8e02859a351250c9ba3999b0aae28abb259641 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Aug 17 20:47:10 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Aug 17 20:47:10 2021 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=1f8e0285 Allow for Gentoo-specific patch versions Signed-off-by: Andreas K. Hüttel gentoo.org> make-tarball.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make-tarball.sh b/make-tarball.sh index d681384..463cb4a 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -46,11 +46,14 @@ mydescpatches=$(git describe) cd "${mypathbinutils}" # check that we're on a branch gentoo/${PV} +# note that we allow for gentoo-specific patch versions, ie., +# * the PV 2.37_p1 lives on branch 2.37 +# * the PV 2.37.1 lives on branch 2.37.1 mybranchinfo=$(git status --porcelain -b|grep '^##') mybranch=$(echo ${mybranchinfo}|sed -e 's:^## ::' -e 's:\.\.\..*$::') -if [[ ! "gentoo/binutils-${PV}" == "${mybranch}" ]] ; then - echo "Error: Your git repository is on the incorrect branch ${mybranch}; should be gentoo/binutils-${PV}" +if [[ ! "gentoo/binutils-${PV%_p?}" == "${mybranch}" ]] ; then + echo "Error: Your git repository is on the incorrect branch ${mybranch}; should be gentoo/binutils-${PV%_p?}" exit 1 fi