diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-30 06:50:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-30 06:50:54 +0000 |
| commit | c77bedb0aebcd5197774b2e85139ceaf78d4f74b (patch) | |
| tree | d7efd1f3df30d217b65cd6726851653b46969690 | |
| parent | 18ff108c5301d4b936142b1924c431a5a1dc8ebc (diff) | |
| download | upstream-c77bedb0aebcd5197774b2e85139ceaf78d4f74b.tar.gz upstream-c77bedb0aebcd5197774b2e85139ceaf78d4f74b.tar.bz2 upstream-c77bedb0aebcd5197774b2e85139ceaf78d4f74b.zip | |
scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r41407
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41408 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | scripts/env | 1 | ||||
| -rwxr-xr-x | scripts/feeds | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/env b/scripts/env index 24d4bec64f..5542b2017b 100755 --- a/scripts/env +++ b/scripts/env @@ -1,6 +1,7 @@ #!/usr/bin/env bash BASEDIR="$PWD" ENVDIR="$PWD/env" +export GREP_OPTIONS= usage() { cat <<EOF diff --git a/scripts/feeds b/scripts/feeds index b1bdee597e..683c50531d 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -11,6 +11,7 @@ use Cwd 'abs_path'; chdir "$FindBin::Bin/.."; $ENV{TOPDIR}=getcwd(); $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'"; +$ENV{GREP_OPTIONS}=""; my $mk=`which gmake 2>/dev/null`; # select the right 'make' program chomp($mk); # trim trailing newline |