nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: disable whitespace fixing for patch.sh / "git am"

Browse Source 
When a patch Gluon provides is applied via "make update" and if this
patch itself modifies a patch that has DOS line endings then this
currently fails. Patch files with DOS line endings unfortunately seem to
sometimes slip into the OpenWrt repository.

It seems that the "git am" invoked by Gluon's patch.sh interprets the
DOS line endings as belonging to the outter patch and deems them
unnecessary. After automatically "fixing" them the outter patch does not
apply anymore as it does not match the content of the inner patch.

This commit fixes this issue by disabling the whitespace fixing which
"git am" applies by default.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>

---
The openwrt/lang/node-hid/patches/000-compile.patch file has such DOS
line endings. The nodejs update coming with the next commit would fail
on "make update" for "node-*: node update to v4.4.4", which removes
000-compile.patch, otherwise.
This commit is contained in:
Linus Lüssing 2019-04-20 06:19:26 +02:00
parent 0a150e97d4
commit 3275091931
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/patch.sh
View File

@ -19,7 +19,7 @@ for module in $GLUON_MODULES; do
cd "$PATCHDIR" cd "$PATCHDIR"
for patch in "$GLUONDIR"/patches/$module/*.patch; do for patch in "$GLUONDIR"/patches/$module/*.patch; do
git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' -c commit.gpgsign=false am --whitespace=nowarn --committer-date-is-author-date "$patch" git -c user.name='Gluon Patch Manager' -c user.email='gluon@void.example.com' -c commit.gpgsign=false am --ignore-space-change --whitespace=nowarn --committer-date-is-author-date "$patch"
done done
cd "$GLUONDIR"/$module cd "$GLUONDIR"/$module