[gentoo-commits] proj/toolchain/binutils-patches:master commit in: /

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     1f8e02859a351250c9ba3999b0aae28abb259641
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 20:47:10 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <dilfridge <AT> 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