xfsdump: improve tooling
cover xfsdump: improve tooling
Hi all,
First patch fixes Makefile for systems with read-only system packages. The second patch copy-pastes release.sh from xfsprogs-dev repository with a few minor improvements (I will send these for xfsprogs too).
xfsdump git tree:
https://git.kernel.org/pub/scm/linux/kernel/git/aalbersh/xfsdump-dev.git/log/?h=better-release
Andrey
Andrey Albershteyn (2):
xfsdump: fix permissions on files installed by libtoolize
xfsdump: update release.sh
Makefile | 3 + release.sh | 197 +++++++++++++++++++++++++++++++++++--- tools/git-contributors.py | 168 ++++++++++++++++++++++++++++++++ 3 files changed, 354 insertions(+), 14 deletions(-) create mode 100755 tools/git-contributors.py
Signature · 1 line
2.51.2
PATCH 1/2 xfsdump: fix permissions on files installed by libtoolize
Libtoolize installs some set of AUX files from its system package. Not all distributions have the same permissions set on these files. For example, read-only libtoolize system package will copy those files without write permissions. This causes build to fail as next line copies ./include/install-sh over ./install-sh which is not writable.
Fix this by setting permission explicitly on files copied by libtoolize.
The same fix in xfsprogs:6b32423addd2 ("xfsprogs: fix permissions on files installed by libtoolize")
--- Makefile | 3 +++ 1 file changed, 3 insertions(+)
Makefile +3 -0
@@ -70,6 +70,9 @@ LIBTOOLIZE_INSTALL = `libtoolize -n -i >/dev/null 2>/dev/null && echo -i` configure: libtoolize -c $(LIBTOOLIZE_INSTALL) -f + chmod 755 config.guess config.sub install-sh + chmod 644 ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ + m4/ltversion.m4 m4/lt~obsolete.m4 cp include/install-sh . aclocal -I m4 autoconf
Signature · 1 line
2.51.2
Re: [PATCH 1/2] xfsdump: fix permissions on files installed by libtoolize
Looks good:
PATCH 2/2 xfsdump: update release.sh
In reply to Andrey AlbershteynUpdate release.sh script to automate releases and for-next updates even more.
This is copy-paste from xfsprogs repository with a few changes:
- update shebang
- s/xfsprogs/xfsdump/
- remove old comment
- remind maintainer to upload tarball
- remove "The for-next branch has also ..." from for-next update email
--- release.sh | 197 +++++++++++++++++++++++++++++++++++--- tools/git-contributors.py | 168 ++++++++++++++++++++++++++++++++ 2 files changed, 351 insertions(+), 14 deletions(-) create mode 100755 tools/git-contributors.py
release.sh +183 -14
@@ -1,30 +1,199 @@ -#!/bin/bash -# -# Automate generation a new release +#!/usr/bin/env bash # +# Automate generation of a new release + +set -e + +KUP=0 +COMMIT=1 +LAST_HEAD="" +FOR_NEXT=0 + +help() { + echo "$(basename $0) - prepare xfsdump release tarball or for-next update" + printf "\t[--kup|-k] upload final tarball with KUP\n" + printf "\t[--no-commit|-n] don't create release commit\n" + printf "\t[--last-head|-l] commit of the last release\n" + printf "\t[--for-next|-f] generate announce email for for-next update\n" +} + +update_version() { + echo "Updating version files" + # doc/CHANGES + header="xfsdump-${version} ($(date +'%d %b %Y'))" + sed -i "1s/^/$header\n\t<TODO list user affecting changes>\n\n/" doc/CHANGES + $EDITOR doc/CHANGES + + # ./configure.ac + CONF_AC="AC_INIT([xfsdump],[${version}],[[email protected]])" + sed -i "s/^AC_INIT.*/$CONF_AC/" ./configure.ac + + # ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ -- Nathan Scott <[email protected]> `date -R`\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ * New upstream release\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/xfsdump (${version}-1) unstable; urgency=low\n/" ./debian/changelog +} + +prepare_mail() { + branch="$1" + mail_file=$(mktemp) + if [ -n "$LAST_HEAD" ]; then + if [ $branch == "master" ]; then + reason="$(git describe --abbrev=0 $branch) released" + for_next_update="\n\nThe for-next branch has also been updated to match the state of master." + else + reason="for-next updated to $(git log --oneline --format="%h" -1 $branch)" + for_next_update="" + fi; + cat << EOF > $mail_file +To: [email protected] +Cc: $(./tools/git-contributors.py $LAST_HEAD..$branch --separator ', ') +Subject: [ANNOUNCE] xfsdump: $reason + +Hi folks, + +The xfsdump $branch branch in repository at: + + git://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git + +has just been updated. + +Patches often get missed, so if your outstanding patches are properly reviewed +on the list and not included in this update, please let me know.$(printf "%b" "$for_next_update") + +The new head of the $branch branch is commit: + +$(git log --oneline --format="%H" -1 $branch) + +New commits: + +$(git shortlog --format="[%h] %s" $LAST_HEAD..$branch) + +Code Diffstat: + +$(git diff --stat --summary -C -M $LAST_HEAD..$branch) +EOF + fi +} + +while [ $# -gt 0 ]; do + case "$1" in + --kup|-k) + KUP=1 + ;; + --no-commit|-n) + COMMIT=0 + ;; + --last-head|-l) + LAST_HEAD=$2 + shift + ;; + --for-next|-f) + FOR_NEXT=1 + ;; + --help|-h) + help + exit 0 + ;; + *) + >&2 printf "Error: Invalid argument\n" + exit 1 + ;; + esac + shift +done + +if [ $FOR_NEXT -eq 1 ]; then + echo "Push your for-next branch:" + printf "\tgit push origin for-next:for-next\n" + prepare_mail "for-next" + if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt -H $mail_file\n" + fi + exit 0 +fi + +if [ -z "$EDITOR" ]; then + EDITOR=$(command -v vi) +fi + +if [ $COMMIT -eq 1 ]; then + if git diff --exit-code ./VERSION > /dev/null; then + $EDITOR ./VERSION + fi +fi . ./VERSION version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} date=`date +"%-d %B %Y"` +if [ $COMMIT -eq 1 ]; then + update_version + + git diff --color=always | less -r + [[ "$(read -e -p 'All good? [Y/n]> '; echo $REPLY)" == [Nn]* ]] && exit 0 + + echo "Commiting new version update to git" + git commit --all --signoff --message="xfsdump: Release v${version} + +Update all the necessary files for a v${version} release." + + echo "Tagging git repository" + git tag --annotate --sign --message="Release v${version}" v${version} +fi + echo "Cleaning up" make realclean +rm -rf "xfsdump-${version}.tar" \ + "xfsdump-${version}.tar.gz" \ + "xfsdump-${version}.tar.asc" \ + "xfsdump-${version}.tar.sign" -echo "Updating CHANGES" -sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ - mv doc/CHANGES.tmp doc/CHANGES - -echo "Commiting CHANGES update to git" -git commit -s -a -m "${version} release" - -echo "Tagging git repository" -git tag -s -a -m "${version} release" v${version} echo "Making source tarball" make dist +gunzip -k "xfsdump-${version}.tar.gz" echo "Sign the source tarball" -gpg --detach-sign xfsdump-${version}.tar.gz +gpg \ + --detach-sign \ + --armor \ + "xfsdump-${version}.tar" -echo "Done. Please remember to push out tags using \"git push --tags\"" +echo "Verify signature" +gpg \ + --verify \ + "xfsdump-${version}.tar.asc" +if [ $? -ne 0 ]; then + echo "Can not verify signature of tarball" + exit 1 +fi + +mv "xfsdump-${version}.tar.asc" "xfsdump-${version}.tar.sign" + +if [ $KUP -eq 1 ]; then + kup put \ + xfsdump-${version}.tar.gz \ + xfsdump-${version}.tar.sign \ + pub/linux/utils/fs/xfs/xfsdump/ +fi; + +prepare_mail "master" + +echo "" +echo "Done. Please remember to push out tags and the branch." +printf "\tgit push origin v${version} master:master master:for-next\n" +if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt -H $mail_file\n" +fi +if [ $KUP -ne 1 ]; then + echo "Don't forget to upload tarball:" + echo -e "\tkup put xfsdump-${version}.tar.gz" \ + "xfsdump-${version}.tar.sign pub/linux/utils/fs/xfs/xfsdump/" +fi
tools/git-contributors.py new file +168 -0
168 lines not on this page · raw message
Signature · 1 line
2.51.2
Re: [PATCH 2/2] xfsdump: update release.sh
Looks good: