projects
/
openwrt
/
staging
/
lynxis.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91042e0
)
check for correct make version ( thanks to Thomas )
author
Ralph Hempel
<ralph.hempel@lantiq.com>
Mon, 2 Mar 2009 17:34:34 +0000
(17:34 +0000)
committer
Ralph Hempel
<ralph.hempel@lantiq.com>
Mon, 2 Mar 2009 17:34:34 +0000
(17:34 +0000)
SVN-Revision: 14727
scripts/feeds
patch
|
blob
|
history
diff --git
a/scripts/feeds
b/scripts/feeds
index 4b53fd1174c90e114aedf13f765684bdae6d32c5..deafaca126c6fd89cadf97715f30c506c4a6c63c 100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-15,6
+15,14
@@
my $mk=`which gmake`; # 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'
+# check version of make
+my @mkver = split /\s+/, `$mk -v`, 4;
+my $valid_mk = 1;
+$mkver[0] =~ /^GNU/ or $valid_mk = 0;
+$mkver[1] =~ /^Make/ or $valid_mk = 0;
+$mkver[2] >= "3.81" or $valid_mk = 0;
+$valid_mk or die "Unsupported version of make found: $mk\n";
+
my @feeds;
my %build_packages;
my %installed;
my @feeds;
my %build_packages;
my %installed;
@@
-72,7
+80,7
@@
sub update_location($$)
return $old_url ? 1 : 0;
}
return $old_url ? 1 : 0;
}
- return 0;
+ return 0;
}
sub update_index($)
}
sub update_index($)
@@
-338,7
+346,7
@@
sub refresh_config {
system("rm -f tmp/.packageinfo");
# refresh the config
system("rm -f tmp/.packageinfo");
# refresh the config
- if ($default) {
+ if ($default) {
system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
} else {
system("$mk defconfig Config.in >/dev/null 2>/dev/null");
system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
} else {
system("$mk defconfig Config.in >/dev/null 2>/dev/null");