aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-08 13:30:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-08 13:30:54 +0000
commit85f1a2c67a7b20d28d950a4e595ef172cb28d156 (patch)
treece23f24690829547ef93e72118bdf6030fc1e8f2
parent7fb394b9ab8e45c85202fc211ee9cabc0f4540c7 (diff)
downloadupstream-85f1a2c67a7b20d28d950a4e595ef172cb28d156.tar.gz
upstream-85f1a2c67a7b20d28d950a4e595ef172cb28d156.tar.bz2
upstream-85f1a2c67a7b20d28d950a4e595ef172cb28d156.zip
add further countermeasures against the git core.autocrlf option (fixes #9075)
SVN-Revision: 31650
-rw-r--r--include/toplevel.mk1
-rwxr-xr-xscripts/feeds1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/toplevel.mk b/include/toplevel.mk
index 9a60139329..721d14c486 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 b8c6825ed0..2c0baa6584 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