projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odhcpd: update to version 2017-03-29 (FS#635)
[openwrt/openwrt.git]
/
scripts
/
feeds
diff --git
a/scripts/feeds
b/scripts/feeds
index 1da44f539fd143ef395132203edcc6f01d64ce1f..dfecaa9bb65222d116d4be71c2d32ffe55011ed2 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;
@@
-9,7
+9,8
@@
use strict;
use Cwd 'abs_path';
chdir "$FindBin::Bin/..";
use Cwd 'abs_path';
chdir "$FindBin::Bin/..";
-$ENV{TOPDIR}=getcwd();
+$ENV{TOPDIR} //= getcwd();
+chdir $ENV{TOPDIR};
$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
$ENV{GREP_OPTIONS}="";
$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
$ENV{GREP_OPTIONS}="";
@@
-22,7
+23,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;
@@
-127,19
+131,19
@@
my %update_method = (
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff",
'controldir' => ".git",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff",
'controldir' => ".git",
- 'revision' => "git
show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2
| tr -d '\n'"},
+ 'revision' => "git
rev-parse --short HEAD
| tr -d '\n'"},
'src-git-full' => {
'init' => "git clone '%s' '%s'",
'init_branch' => "git clone --branch '%s' '%s' '%s'",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff",
'controldir' => ".git",
'src-git-full' => {
'init' => "git clone '%s' '%s'",
'init_branch' => "git clone --branch '%s' '%s' '%s'",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff",
'controldir' => ".git",
- 'revision' => "git
show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2
| tr -d '\n'"},
+ 'revision' => "git
rev-parse --short HEAD
| tr -d '\n'"},
'src-gitsvn' => {
'init' => "git svn clone -r HEAD '%s' '%s'",
'update' => "git svn rebase",
'controldir' => ".git",
'src-gitsvn' => {
'init' => "git svn clone -r HEAD '%s' '%s'",
'update' => "git svn rebase",
'controldir' => ".git",
- 'revision' => "git
show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2
| tr -d '\n'"},
+ 'revision' => "git
rev-parse --short HEAD
| tr -d '\n'"},
'src-bzr' => {
'init' => "bzr checkout --lightweight '%s' '%s'",
'update' => "bzr update",
'src-bzr' => {
'init' => "bzr checkout --lightweight '%s' '%s'",
'update' => "bzr update",
@@
-314,7
+318,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;
@@
-330,7
+334,7
@@
sub list {
my $localpath = "./feeds/$feed->[1]";
my $m = $update_method{$feed->[0]};
my $revision;
my $localpath = "./feeds/$feed->[1]";
my $m = $update_method{$feed->[0]};
my $revision;
- if
( !$m->{'revision'}
) {
+ if
(!-d "$localpath" || !$m->{'revision'}
) {
$revision = "X";
}
elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
$revision = "X";
}
elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
@@
-342,8
+346,16
@@
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 {
else {
- printf "\%-
8
s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
+ printf "\%-
10
s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
}
}
return 0;
}
}
return 0;
@@
-523,6
+535,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
+775,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: