浏览代码

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

SVN-Revision: 31650
Felix Fietkau 13 年之前
父节点
当前提交
85f1a2c67a
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      include/toplevel.mk
  2. 1 0
      scripts/feeds

+ 1 - 0
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

+ 1 - 0
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