aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2018-06-22 20:02:48 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2018-07-15 13:26:26 +0200
commit1f26c975b5048aefdfe33daa0e57d875b03fa01a (patch)
tree68d4d352a1a9315b8c3fdd58c9f7ba6d48f50cdf
parentGentoo: Fix test for precise textrel warning message, after non-shared object... (diff)
downloadbinutils-gdb-1f26c975b5048aefdfe33daa0e57d875b03fa01a.tar.gz
binutils-gdb-1f26c975b5048aefdfe33daa0e57d875b03fa01a.tar.bz2
binutils-gdb-1f26c975b5048aefdfe33daa0e57d875b03fa01a.zip
[no-patch] Gentoo: make patch tarball script 9999-ready
-rwxr-xr-xscripts/gentoo/make-tarball.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/gentoo/make-tarball.sh b/scripts/gentoo/make-tarball.sh
index 202ac30f500..e08fd0631d7 100755
--- a/scripts/gentoo/make-tarball.sh
+++ b/scripts/gentoo/make-tarball.sh
@@ -67,6 +67,9 @@ if [[ ! -z "${mytaginfo}" ]] ; then
else
starttag="binutils-${PV//./_}"
fi
+if [[ "${PV}" == "9999" ]]; then
+ starttag="master"
+fi
echo "Starting from tag ${starttag}"
mkdir -p tmp/patch
@@ -87,10 +90,12 @@ for myname in 0*.patch ; do
mv ${myname} tmp/patch/ || exit 1
done
-# add the extra patch
+# add the extra patch if needed
-cp scripts/gentoo/0000-Gentoo-Git-is-development tmp/patch/0000-Gentoo-Git-is-development.patch || exit 1
-cp scripts/gentoo/9999-Gentoo-We-make-a-release tmp/patch/9999-Gentoo-We-make-a-release.patch || exit 1
+if [[ "${PV}" != "9999" ]]; then
+ cp scripts/gentoo/0000-Gentoo-Git-is-development tmp/patch/0000-Gentoo-Git-is-development.patch || exit 1
+ cp scripts/gentoo/9999-Gentoo-We-make-a-release tmp/patch/9999-Gentoo-We-make-a-release.patch || exit 1
+fi
# add a history file