projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm2708-gpu-fw: update to latest version
[openwrt/openwrt.git]
/
scripts
/
feeds
diff --git
a/scripts/feeds
b/scripts/feeds
index 1da44f539fd143ef395132203edcc6f01d64ce1f..045835c0cc3a09436c4684e403041e0dcf5ff59d 100755
(executable)
--- a/
scripts/feeds
+++ b/
scripts/feeds
@@
-1,4
+1,4
@@
-#!/usr/bin/perl
+#!/usr/bin/
env
perl
use Getopt::Std;
use FindBin;
use Cwd;
use Getopt::Std;
use FindBin;
use Cwd;
@@
-22,7
+22,10
@@
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;
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;
+
+my ($mkv1, $mkv2) = split /\./, $mkver[2];
+($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0;
+
$valid_mk or die "Unsupported version of make found: $mk\n";
my @feeds;
$valid_mk or die "Unsupported version of make found: $mk\n";
my @feeds;
@@
-314,7
+317,7
@@
sub list_feed {
sub list {
my %opts;
sub list {
my %opts;
- getopts('r:d:nsh', \%opts);
+ getopts('r:d:nsh
f
', \%opts);
if ($opts{h}) {
usage();
return 0;
if ($opts{h}) {
usage();
return 0;
@@
-342,6
+345,14
@@
sub list {
if ($opts{d}) {
printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]});
}
if ($opts{d}) {
printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]});
}
+ elsif ($opts{f}) {
+ my $uri = join(", ", @{$feed->[2]});
+ if ($revision ne "local" && $revision ne "X") {
+ $uri =~ s/[;^].*//;
+ $uri .= "^" . $revision;
+ }
+ printf "%s %s %s\n", $feed->[0], $feed->[1], $uri;
+ }
else {
printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
}
else {
printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
}
@@
-523,6
+534,11
@@
sub install_package {
sub refresh_config {
my $default = shift;
sub refresh_config {
my $default = shift;
+ # Don't create .config if it doesn't already exist so that making a
+ # config only occurs when the user intends it do (however we do
+ # want to refresh an existing config).
+ return if not (-e '.config');
+
# workaround for timestamp check
system("rm -f tmp/.packageinfo");
# workaround for timestamp check
system("rm -f tmp/.packageinfo");
@@
-758,6
+774,7
@@
Commands:
-s : List of feed names and their URL.
-r <feedname>: List packages of specified feed.
-d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
-s : List of feed names and their URL.
-r <feedname>: List packages of specified feed.
-d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
+ -f : List feeds in feeds.conf compatible format (when using -s).
install [options] <package>: Install a package
Options:
install [options] <package>: Install a package
Options: