qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:23:09 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31650 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-05-08 13:30:54 +00:00
parent 6540a914ba
commit c589be6470
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/toplevel.mk
View File

@ -24,6 +24,7 @@ export OPENWRTVERSION
export IS_TTY=$(shell tty -s && echo 1 || echo 0) 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 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 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 # prevent perforce from messing with the patch utility
unexport P4PORT P4USER P4CONFIG P4CLIENT unexport P4PORT P4USER P4CONFIG P4CLIENT

1
scripts/feeds
View File

@ -10,6 +10,7 @@ use Cwd 'abs_path';
chdir "$FindBin::Bin/.."; chdir "$FindBin::Bin/..";
$ENV{TOPDIR}=getcwd(); $ENV{TOPDIR}=getcwd();
$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
my $mk=`which gmake`; # select the right 'make' program my $mk=`which gmake`; # select the right 'make' program
chomp($mk); # trim trailing newline chomp($mk); # trim trailing newline