diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-08 13:30:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-08 13:30:54 +0000 |
| commit | c589be64704473b15e8fac577f3fdb928d194d91 (patch) | |
| tree | 863e5e03a3ea10cf90d51168e8d5dfe02c1c685f | |
| parent | 6540a914ba1bb011f6756f39b6eb4dae29b3d893 (diff) | |
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
| -rw-r--r-- | include/toplevel.mk | 1 | ||||
| -rwxr-xr-x | scripts/feeds | 1 |
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 |