projects
/
openwrt
/
svn-archive
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
412654b
)
scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 30 Jun 2014 06:50:54 +0000
(06:50 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 30 Jun 2014 06:50:54 +0000
(06:50 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r41407
SVN-Revision: 41408
scripts/env
patch
|
blob
|
history
scripts/feeds
patch
|
blob
|
history
diff --git
a/scripts/env
b/scripts/env
index 24d4bec64f06953695ea3bc0dfafb233d33f96d7..5542b2017be31c4282ba4677aa10d50a6619d52b 100755
(executable)
--- 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 b1bdee597ea0f2e1a8c5da5553bd9064737cb949..683c50531dfc3adecb8b1ef454322c1bc84d62ec 100755
(executable)
--- 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