summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-06-30 06:50:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-06-30 06:50:22 +0000
commitdcb5d00875b8a6834e7e293aad9e3775518d18e6 (patch)
treec49933b89643db7d96d1e5d342afc3a3976bbf1b /scripts
parent26b06940a9bd894c1a21d76b160a3daea0843417 (diff)
scripts: unset GREP_OPTIONS in env and feeds (fixes #16924)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 41407
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/env1
-rwxr-xr-xscripts/feeds1
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 85aeab5520..be07e59613 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
Powered by cgit, Themed by Ted Yin.