summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2020-06-09 23:50:38 +0300
committerAndreas K. Hüttel <dilfridge@gentoo.org>2020-06-09 23:51:21 +0300
commit2444bf09ee2324730cb0cbe9b5180c813e19bfb4 (patch)
tree8d975e2b8917d9623dbcf326590d74f673715b42
parentUpdate make-tarball.sh for separate glibc and glibc-patches repos (diff)
downloadglibc-patches-2444bf09ee2324730cb0cbe9b5180c813e19bfb4.tar.gz
glibc-patches-2444bf09ee2324730cb0cbe9b5180c813e19bfb4.tar.bz2
glibc-patches-2444bf09ee2324730cb0cbe9b5180c813e19bfb4.zip
Update readme and record used make-tarball.sh version in tarballglibc-patches-20200609
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r--README.Gentoo.patches9
-rwxr-xr-xmake-tarball.sh7
2 files changed, 15 insertions, 1 deletions
diff --git a/README.Gentoo.patches b/README.Gentoo.patches
index c6f94dc..b6ac163 100644
--- a/README.Gentoo.patches
+++ b/README.Gentoo.patches
@@ -15,7 +15,11 @@ original creators, etc...
=== Where ===
=============
-Currently, https://github.com/gentoo/glibc
+https://gitweb.gentoo.org/fork/glibc.git/
+
+The patch generation script and the base patchset for the start of a new
+version branch (or for use with glibc git master) can be found at
+https://gitweb.gentoo.org/proj/toolchain/glibc-patches.git/
===========
=== How ===
@@ -24,3 +28,6 @@ Currently, https://github.com/gentoo/glibc
Patches are named exactly as generated by "git format-patch".
All patches thus apply with -p1 (so they can be used both with the legacy
epatch function and the new, more strict eapply function).
+
+
+ -----------
diff --git a/make-tarball.sh b/make-tarball.sh
index 1063e1b..c3ac509 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -44,6 +44,8 @@ if [[ ! -z "${mystatusinfo}" ]] ; then
exit 1
fi
+mydescpatches=$(git describe)
+
# go into the gentoo glibc repo
cd "${mypathglibc}"
@@ -65,6 +67,8 @@ if [[ ! -z "${mystatusinfo}" ]] ; then
exit 1
fi
+mydescglibc=$(git describe)
+
# check if the tag already exists
mytaginfo=$(git tag -l|grep "gentoo/glibc-${PV}-${pver}")
@@ -96,6 +100,9 @@ mkdir -p tmp/patches
cp "${mypathpatches}/README.Gentoo.patches" tmp/ || exit 1
+echo >> "tmp/README.Gentoo.patches"
+echo "Generated with make-tarball.sh ${mydescpatches}" >> "tmp/README.Gentoo.patches"
+
# create and rename patches
if [[ "${PV}" == "9999" ]]; then