From c589be64704473b15e8fac577f3fdb928d194d91 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 8 May 2012 13:30:54 +0000 Subject: [PATCH] add further countermeasures against the git core.autocrlf option (fixes #9075) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31650 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/toplevel.mk | 1 + scripts/feeds | 1 + 2 files changed, 2 insertions(+) diff --git a/include/toplevel.mk b/include/toplevel.mk index 9a6013932..721d14c48 100644 --- 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 b8c6825ed..2c0baa658 100755 --- 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