add further countermeasures against the git core.autocrlf option (fixes #9075)

SVN-Revision: 31650

diff --git a/include/toplevel.mk b/include/toplevel.mk
index 9a60139329cdc18a5dca6c8682b8609fff956a54..721d14c4864bd7431e3e8787fa566345c808825a 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -24,6 +24,7 @@ export OPENWRTVERSION
 export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 export LD_LIBRARY_PATH:=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
 export DYLD_LIBRARY_PATH:=$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib
+export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
 
 # prevent perforce from messing with the patch utility
 unexport P4PORT P4USER P4CONFIG P4CLIENT

diff --git a/scripts/feeds b/scripts/feeds
index b8c6825ed084a6e3810cd119486ceafe3a016891..2c0baa6584245104572f3383f93eb2b8a8b0fa83 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -10,6 +10,7 @@ use Cwd 'abs_path';
 
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
+$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
 
 my $mk=`which gmake`;  # select the right 'make' program
 chomp($mk);            # trim trailing newline