From 32750919319df098f97f26b7509527a04fc40bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Sat, 20 Apr 2019 06:19:26 +0200 Subject: [PATCH] scripts: disable whitespace fixing for patch.sh / "git am" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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. --- scripts/patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/patch.sh b/scripts/patch.sh index 2b0aa29e..95195127 100755 --- a/scripts/patch.sh +++ b/scripts/patch.sh @@ -19,7 +19,7 @@ for module in $GLUON_MODULES; do cd "$PATCHDIR" 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 cd "$GLUONDIR"/$module