projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[scripts] fix library bundling when host libraries reside in /lib/tls/ or similar
[15.05/openwrt.git]
/
scripts
/
feeds
diff --git
a/scripts/feeds
b/scripts/feeds
index
b423d8e
..
b1bdee5
100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-10,8
+10,9
@@
use Cwd 'abs_path';
chdir "$FindBin::Bin/..";
$ENV{TOPDIR}=getcwd();
chdir "$FindBin::Bin/..";
$ENV{TOPDIR}=getcwd();
+$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
-my $mk=`which gmake
`;
# select the right 'make' program
+my $mk=`which gmake
2>/dev/null`;
# select the right 'make' program
chomp($mk); # trim trailing newline
$mk or $mk = "make"; # default to 'make'
chomp($mk); # trim trailing newline
$mk or $mk = "make"; # default to 'make'
@@
-116,8
+117,8
@@
my %update_method = (
'update' => "",
'revision' => "echo -n 'local'"},
'src-git' => {
'update' => "",
'revision' => "echo -n 'local'"},
'src-git' => {
- 'init' => "git clone '%s' '%s'",
- 'init_branch' => "git clone --branch '%s' '%s' '%s'",
+ 'init' => "git clone
--depth 1
'%s' '%s'",
+ 'init_branch' => "git clone --
depth 1 --
branch '%s' '%s' '%s'",
'update' => "git pull",
'controldir' => ".git",
'revision' => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
'update' => "git pull",
'controldir' => ".git",
'revision' => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
@@
-540,7
+541,7
@@
sub update {
my $perform_update=1;
$ENV{SCAN_COOKIE} = $$;
my $perform_update=1;
$ENV{SCAN_COOKIE} = $$;
- $ENV{
KBUILD_VERBOSE} = 99
;
+ $ENV{
OPENWRT_VERBOSE} = 's'
;
getopts('ahi', \%opts);
getopts('ahi', \%opts);