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

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

[Sam James]

commit:     bc078d7a8f62243194491cfe4c858ed49fd9fe6c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 13:40:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 13:40:41 2024 +0000
URL:        https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=bc078d7a

README.Gentoo.patches: fix typo

Signed-off-by: Sam James <sam <AT> gentoo.org>

 README.Gentoo.patches | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.Gentoo.patches b/README.Gentoo.patches
index f888dbf..e183a61 100644
--- a/README.Gentoo.patches
+++ b/README.Gentoo.patches
@@ -3,7 +3,7 @@
  ============
 
 Gentoo patchsets for binutils are maintained as vendor branches of the upstream
-binutils-glb git repository. From there, we bundle all the commits into a tarball
+binutils-gdb git repository. From there, we bundle all the commits into a tarball
 and distribute it via our public mirroring system.
 
 If you want specific info about a patch (like what it does or whose great idea 

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

[Andreas K. Hüttel]

commit:     2db00e57a0f1f2715404f4b7b85f5ca8d8f1fbfe
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 20:54:44 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 20:57:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=2db00e57

Allow for empty patchsets

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 make-tarball.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index 463cb4a..cb50a93 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -130,7 +130,7 @@ rm -f 0???-no-patch-*.patch
 rm -f 0???-Automatic-date-update-in-version.in.patch
 
 for myname in 0*.patch ; do
-	mv ${myname} tmp/patch/ || exit 1
+	mv ${myname} tmp/patch/
 done
 
 # add the extra patch

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

[Andreas K. Hüttel]

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
 

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

[Andreas K. Hüttel]

commit:     ff90dfd94451fdeee09f6c9c98d8397c4927838a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 11:05:41 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 11:07:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=ff90dfd9

Update README

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 README.Gentoo.patches | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.Gentoo.patches b/README.Gentoo.patches
index 504dc67..f888dbf 100644
--- a/README.Gentoo.patches
+++ b/README.Gentoo.patches
@@ -15,7 +15,11 @@ original creators, etc...
  === Where ===
  =============
 
-Currently, https://github.com/gentoo/binutils-gdb
+https://gitweb.gentoo.org/fork/binutils-gdb.git/
+
+The patch generation script and the base patchset for the start of a new
+version branch (or for use with binutils git master) can be found at
+https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/
 
  ===========
  === How ===

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

[Andreas K. Hüttel]

commit:     6ac356f185ac11eb7f3dca95a9222c89478c8bfa
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 10:57:36 2020 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 11:07:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=6ac356f1

Adapt for two-repo setup

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 make-tarball.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/make-tarball.sh b/make-tarball.sh
index 575f48b..9f9bd9f 100755
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+mypathbinutils=${GENTOO_BINUTILS_REPO:-~/Gentoo/misc/binutils-gdb}
+mypathpatches=${GENTOO_BINUTILS_PATCHES_REPO:-~/Gentoo/misc/binutils-patches}
+
 PN="binutils"
 PV=$1
 pver=$2
@@ -10,13 +13,38 @@ if [[ -z ${PV} ]] ; then
 	exit 1
 fi
 
-# check that we're in the root of a binutils-gdb git repo
+# check that we have a gentoo binutils patches git repo
+
+if [[ ! -f "${mypathpatches}/README.Gentoo.patches" ]] || [[ ! -d "${mypathpatches}/All" ]] ; then
+	echo "Error: GENTOO_BINUTILS_PATCHES_REPO needs to point to the main directory of a Gentoo binutils patchset git clone"
+	exit 1
+fi
+
+# check that we have a gentoo binutils git repo
+
+if [[ ! -f "${mypathbinutils}/COPYING.LIBGLOSS" ]] || [[ ! -d "${mypathbinutils}/.git" ]] ; then
+	echo "Error: GENTOO_BINUTILS_REPO needs to point to the main directory of a Gentoo binutils-gdb git clone"
+	exit 1
+fi
+
+# go into the gentoo patches repo
+
+cd "${mypathpatches}"
+
+# check that the working directory is clean
 
-if [[ ! -f COPYING.LIBGLOSS ]] || [[ ! -d .git ]] ; then
-	echo "Error: You need to call this script in the main directory of a Gentoo binutils-gdb git clone"
+mystatusinfo=$(git status --porcelain)
+if [[ ! -z "${mystatusinfo}" ]] ; then
+	echo "Error: Your binutils patches working directory is not clean"
 	exit 1
 fi
 
+mydescpatches=$(git describe)
+
+# go into the binutils glibc repo
+
+cd "${mypathbinutils}"
+
 # check that we're on a branch gentoo/${PV}
 
 mybranchinfo=$(git status --porcelain -b|grep '^##')
@@ -61,22 +89,29 @@ rm -f 0*.patch
 
 # check if we have to override the upstream tag
 
+if [[ "${PV}" == "9999" ]]; then
+	# working with master is not supported anymore
+	echo "Patchsets for git master are not supported anymore"
+    exit 1
+fi
+
 mytaginfo=$(git tag -l|grep "gentoo/binutils-${PV}-upstream")
 if [[ ! -z "${mytaginfo}" ]] ; then
 	starttag="gentoo/binutils-${PV}-upstream"
 else
 	starttag="binutils-${PV//./_}"
 fi
-if [[ "${PV}" == "9999" ]]; then
-	starttag="master"
-fi
+
 echo "Starting from tag ${starttag}"
 
 mkdir -p tmp/patch
 
 # copy README.Gentoo.patches
 
-cp scripts/gentoo/README.Gentoo.patches tmp/ || exit 1
+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
 
@@ -86,6 +121,7 @@ git format-patch ${starttag}..HEAD > /dev/null || exit 1
 # - [no-tarball]: not related to upstream tarball
 # - [no-patch]: not related to upstream patches
 # - "Automatic date update in version.in": daily bumps
+# from 2.35 on this should not be needed anymore (no such commits)
 rm -f 0???-no-tarball-*.patch
 rm -f 0???-no-patch-*.patch
 rm -f 0???-Automatic-date-update-in-version.in.patch
@@ -97,8 +133,8 @@ done
 # add the extra patch if needed
 
 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
+	cp "${mypathpatches}/All/0000-Gentoo-Git-is-development" tmp/patch/0000-Gentoo-Git-is-development.patch || exit 1
+	cp "${mypathpatches}/All/9999-Gentoo-We-make-a-release" tmp/patch/9999-Gentoo-We-make-a-release.patch || exit 1
 fi
 
 # add a history file