summaryrefslogtreecommitdiffstats
path: root/tools/patch-tool-mxe
diff options
context:
space:
mode:
authorBoris Nagaev <bnagaev@gmail.com>2015-11-29 10:16:54 (GMT)
committerBoris Nagaev <bnagaev@gmail.com>2015-11-29 12:16:31 (GMT)
commit499ae65452af1a6e8260aad561b63a3782fb59fe (patch)
tree71cb192a02d32c469fa6afd11c4b32a7c662dece /tools/patch-tool-mxe
parent702b214c8316c347fb2ee75e07d36af70a7e0c4e (diff)
downloadmxe-499ae65452af1a6e8260aad561b63a3782fb59fe.zip
mxe-499ae65452af1a6e8260aad561b63a3782fb59fe.tar.gz
mxe-499ae65452af1a6e8260aad561b63a3782fb59fe.tar.bz2
patch-tool-mxe: do not replace author with "MXE"
Replace existing "From: MXE" with "From: fix@me". Authors of such patches can be found using git history. see #983
Diffstat (limited to 'tools/patch-tool-mxe')
-rwxr-xr-xtools/patch-tool-mxe8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe
index 1ba10c9..8632612 100755
--- a/tools/patch-tool-mxe
+++ b/tools/patch-tool-mxe
@@ -20,9 +20,6 @@ setupEnv() {
mkdir -p ${gitsdir}
- # John Doe <John Doe@acme.org>
- export author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'`
-
export pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \
sed 's/.*:= \(.*\)/\1/'`
@@ -100,8 +97,7 @@ function export_patch {
echo ''
echo 'Contains ad hoc patches for cross building.'
echo ''
- git format-patch -p --stdout dist..HEAD | \
- sed 's/^From: .*/From: MXE/g;'
+ git format-patch -p --stdout dist..HEAD
) > $mxedir/src/${pkg}-${patch_name}.patch && \
echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch"
}
@@ -117,7 +113,7 @@ function import_patch {
cd $gitsdir/$pkg_subdir && \
cat ${mxedir}/src/${pkg}-${patch_name}.patch | \
sed '/^From/,$ !d' | \
- sed s/'^From: .*'/"From: $author"/'g;' | \
+ sed s/'^From: MXE'/"From: fix@me"/'g;' | \
git am --keep-cr && \
echo "Imported ${mxedir}/src/${pkg}-${patch_name}.patch"
else