diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-06-09 23:52:27 +0300 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2020-06-09 23:52:27 +0300 |
commit | 4901cea39ba5abf8d5cec53d220212b37b7a5172 (patch) | |
tree | 04d0f5897c842d44ef70ee8872d73317385e78e0 | |
parent | nss_compat: internal_end*ent may clobber errno, hiding ERANGE [BZ #25976] (diff) | |
download | glibc-4901cea39ba5abf8d5cec53d220212b37b7a5172.tar.gz glibc-4901cea39ba5abf8d5cec53d220212b37b7a5172.tar.bz2 glibc-4901cea39ba5abf8d5cec53d220212b37b7a5172.zip |
[no-patch] Gentoo: remove remaining patchset generation logic, now in separate repogentoo/glibc-2.31-6
-rw-r--r-- | scripts/gentoo/README.Gentoo.patches | 26 | ||||
-rw-r--r-- | scripts/gentoo/extra/.keep | 0 | ||||
-rwxr-xr-x | scripts/gentoo/make-tarball.sh | 107 |
3 files changed, 0 insertions, 133 deletions
diff --git a/scripts/gentoo/README.Gentoo.patches b/scripts/gentoo/README.Gentoo.patches deleted file mode 100644 index c6f94dc863..0000000000 --- a/scripts/gentoo/README.Gentoo.patches +++ /dev/null @@ -1,26 +0,0 @@ - ============ - === What === - ============ - -Gentoo patchsets for glibc are maintained as vendor branches of the upstream -glibc 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 -it was to change the code), read the patch! We try to fill out the commit -messages with useful info such as what it does, why it's needed, bug reports, -original creators, etc... - - ============= - === Where === - ============= - -Currently, https://github.com/gentoo/glibc - - =========== - === How === - =========== - -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/scripts/gentoo/extra/.keep b/scripts/gentoo/extra/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/scripts/gentoo/extra/.keep +++ /dev/null diff --git a/scripts/gentoo/make-tarball.sh b/scripts/gentoo/make-tarball.sh deleted file mode 100755 index a4f380d632..0000000000 --- a/scripts/gentoo/make-tarball.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -PN="glibc" -PV=${1%/} -pver=$2 - -if [[ -z ${PV} ]] ; then - echo "Usage: $0 glibc-version patchset-version-to-be-created" - echo "Please read the script before trying to use it :)" - exit 1 -fi - -# check that we're in the root of a glibc git repo - -if [[ ! -f libc-abis ]] || [[ ! -d .git ]] ; then - echo "Error: You need to call this script in the main directory of a Gentoo glibc git clone" - exit 1 -fi - -# check that we're on a branch gentoo/${PV} - -mybranchinfo=$(git status --porcelain -b|grep '^##') -mybranch=$(echo ${mybranchinfo}|sed -e 's:^## ::' -e 's:\.\.\..*$::') -if [[ ! "gentoo/${PV}" == "${mybranch}" ]] ; then - echo "Error: Your git repository is on the incorrect branch ${mybranch}; should be gentoo/${PV}" - exit 1 -fi - -# check that the working directory is clean - -mystatusinfo=$(git status --porcelain) -if [[ ! -z "${mystatusinfo}" ]] ; then - echo "Error: Your working directory is not clean" - exit 1 -fi - -# check if the tag already exists - -mytaginfo=$(git tag -l|grep "gentoo/glibc-${PV}-${pver}") -if [[ ! -z "${mytaginfo}" ]] ; then - echo "Error: A tag corresponding to this patch level already exists (gentoo/glibc-${PV}-${pver})" - exit 1 -fi - -# luckily glibc git has no /tmp dir and no tar.xz files, but let's better check and be pathologically careful - -if [[ -e tmp ]] || [[ -e ${PN}-${PV}-patches-${pver}.tar.xz ]] ; then - echo "Error: tmp or ${PN}-${PV}-patches-${pver}.tar.xz exists in git" - exit 1 -fi -rm -rf tmp -rm -f ${PN}-${PV}-*.tar.xz - -for myname in 0*.patch ; do - if [[ -e ${myname} ]]; then - echo "Error: ${myname} exists in git" - exit 1 - fi -done -rm -f 0*.patch - -mkdir -p tmp/patches - -# copy README.Gentoo.patches - -cp scripts/gentoo/README.Gentoo.patches tmp/ || exit 1 - -# create and rename patches - -if [[ "${PV}" == "9999" ]]; then - # we're working with master, start from upstream master - startpoint="master" -else - # release branch, start from upstream release tag - startpoint="glibc-${PV}" -fi - -git format-patch ${startpoint}..HEAD > /dev/null - -# remove all patches where the summary line starts with [no-tarball] or [no-patch] - -rm -f 0???-no-tarball-*.patch -rm -f 0???-no-patch-*.patch - -# move patches into temporary directory - -mv 0*.patch tmp/patches/ || exit 1 - -# copy support files - -cp -r scripts/gentoo/extra tmp/ || exit 1 - -# add a history file - -git log --stat --decorate ${startpoint}..HEAD > tmp/patches/README.history || exit 1 - -# package everything up - -tar -Jcf ${PN}-${PV}-patches-${pver}.tar.xz \ - -C tmp patches extra README.Gentoo.patches || exit 1 -rm -r tmp - -du -b *.tar.xz - -# tag the commit - -git tag -s -m "Gentoo patchset ${PV}-${pver}" "gentoo/glibc-${PV}-${pver}" |