diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-02-27 09:38:12 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-02-27 09:38:12 +0100 |
| commit | 494e434c05fee088aa5290bca37e29c923b316d5 (patch) | |
| tree | 566563d731354623b8fb76aa15e14484ac24a4a5 /maintainer-scripts | |
| parent | cf70bb0fbd7fb0f4bca99c53a36d0a389dcc2fc5 (diff) | |
| download | gcc-494e434c05fee088aa5290bca37e29c923b316d5.zip gcc-494e434c05fee088aa5290bca37e29c923b316d5.tar.gz gcc-494e434c05fee088aa5290bca37e29c923b316d5.tar.bz2 | |
maintainer-scripts: Speed up git clone in gcc_release
When doing the 8.4-rc1, I've noticed (probably also because of the dying
disk on sourceware) that git clone is extremely slow, and furthermore when
all of us have some local snapshots, it is a waste of resources to download
everything again. Especially for the -f runs when we'll need to wait until
git tag -s asks us for a gpg password interactively.
The following patch adds an option through which one can point the script
at a local gcc .git directory from which it can --dissociate --reference ...
during cloning to speed it up.
2020-02-27 Jakub Jelinek <jakub@redhat.com>
* gcc_release: Add support for -b local-git-repo argument.
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 4 | ||||
| -rwxr-xr-x | maintainer-scripts/gcc_release | 19 |
2 files changed, 19 insertions, 4 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index 4fca869..4efd475 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,3 +1,7 @@ +2020-02-27 Jakub Jelinek <jakub@redhat.com> + + * gcc_release: Add support for -b local-git-repo argument. + 2020-01-13 Jonathan Wakely <jwakely@redhat.com> * update_web_docs_libstdcxx_git: New file. diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release index 8be8701..74cce1a 100755 --- a/maintainer-scripts/gcc_release +++ b/maintainer-scripts/gcc_release @@ -9,7 +9,7 @@ # Contents: # Script to create a GCC release. # -# Copyright (c) 2001-2018 Free Software Foundation. +# Copyright (c) 2001-2020 Free Software Foundation. # # This file is part of GCC. # @@ -78,6 +78,7 @@ Options: -p previous-tarball Location of a previous tarball (to generate diff files). -t tag Tag to mark the release in git. -u username Username for upload operations. + -b local-git-repo Local git repository to speed up cloning. EOF exit 1 } @@ -103,8 +104,14 @@ build_sources() { changedir "${WORKING_DIRECTORY}" # Check out the sources. - ${GIT} clone -q -b "${GITBRANCH}" "${GITROOT}" "`basename ${SOURCE_DIRECTORY}`" || \ - error "Could not check out release sources" + if [ -n "${GIT_REFERENCE}" ]; then + ${GIT} clone -q --dissociate --reference "${GIT_REFERENCE}" \ + -b "${GITBRANCH}" "${GITROOT}" "`basename ${SOURCE_DIRECTORY}`" || \ + error "Could not check out release sources" + else + ${GIT} clone -q -b "${GITBRANCH}" "${GITROOT}" "`basename ${SOURCE_DIRECTORY}`" || \ + error "Could not check out release sources" + fi # If this is a final release, make sure that the ChangeLogs # and version strings are updated. @@ -567,6 +574,9 @@ TAG="" # The old tarballs from which to generate diffs. OLD_TARS="" +# Local gcc git checkout to speed up git cloning. +GIT_REFERENCE="" + # The directory that will be used to construct the release. The # release itself will be placed in a subdirectory of this directory. DESTINATION=${HOME} @@ -613,7 +623,7 @@ TAR="${TAR:-tar}" ######################################################################## # Parse the options. -while getopts "d:fr:u:t:p:s:l" ARG; do +while getopts "d:fr:u:t:p:s:lb:" ARG; do case $ARG in d) DESTINATION="${OPTARG}";; r) RELEASE="${OPTARG}";; @@ -631,6 +641,7 @@ while getopts "d:fr:u:t:p:s:l" ARG; do if [ ! -f ${OPTARG} ]; then error "-p argument must name a tarball" fi;; + b) GIT_REFERENCE="${OPTARG}";; \?) usage;; esac done |