projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
layerscape: fix compile issue for usb ehci-fsl driver
[openwrt/staging/hauke.git]
/
scripts
/
feeds
diff --git
a/scripts/feeds
b/scripts/feeds
index 7744dd068e6baa268eba594b4154468bd0896d65..55c294ad0a4ec2f0419d12deddeda7324c349e04 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;
@@
-126,20
+130,22
@@
my %update_method = (
'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff",
'init_branch' => "git clone --depth 1 --branch '%s' '%s' '%s'",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff",
+ 'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)",
'controldir' => ".git",
'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",
'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",
+ 'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)",
'controldir' => ".git",
'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",
@@
-157,11
+163,12
@@
my %update_method = (
# src-git: pull broken
# src-cpy: broken if `basename $src` != $name
# src-git: pull broken
# src-cpy: broken if `basename $src` != $name
-sub update_feed_via($$$$) {
+sub update_feed_via($$$$
$
) {
my $type = shift;
my $name = shift;
my $src = shift;
my $relocate = shift;
my $type = shift;
my $name = shift;
my $src = shift;
my $relocate = shift;
+ my $force = shift;
my $m = $update_method{$type};
my $localpath = "./feeds/$name";
my $m = $update_method{$type};
my $localpath = "./feeds/$name";
@@
-182,7
+189,11
@@
sub update_feed_via($$$$) {
} elsif ($m->{'init_commit'} and $commit) {
# in case git hash has been provided don't update the feed
} else {
} elsif ($m->{'init_commit'} and $commit) {
# in case git hash has been provided don't update the feed
} else {
- system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
+ my $update_cmd = $m->{'update'};
+ if ($force && exists $m->{'update_force'}) {
+ $update_cmd = $m->{'update_force'};
+ }
+ system("cd '$safepath'; $update_cmd") == 0 or return 1;
}
return 0;
}
return 0;
@@
-314,7
+325,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
+341,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
+353,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
+542,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");
@@
-647,13
+671,15
@@
sub uninstall {
return 0;
}
return 0;
}
-sub update_feed($$$$)
+sub update_feed($$$$
$
)
{
my $type=shift;
my $name=shift;
my $src=shift;
my $perform_update=shift;
{
my $type=shift;
my $name=shift;
my $src=shift;
my $perform_update=shift;
+ my $force_update=shift;
my $force_relocate=update_location( $name, "@$src" );
my $force_relocate=update_location( $name, "@$src" );
+ my $rv=0;
if( $force_relocate ) {
warn "Source of feed $name has changed, replacing copy\n";
if( $force_relocate ) {
warn "Source of feed $name has changed, replacing copy\n";
@@
-666,9
+692,16
@@
sub update_feed($$$$)
my $failed = 1;
foreach my $feedsrc (@$src) {
warn "Updating feed '$name' from '$feedsrc' ...\n";
my $failed = 1;
foreach my $feedsrc (@$src) {
warn "Updating feed '$name' from '$feedsrc' ...\n";
- next unless update_feed_via($type, $name, $feedsrc, $force_relocate) == 0;
+ if (update_feed_via($type, $name, $feedsrc, $force_relocate, $force_update) != 0) {
+ if ($force_update) {
+ $rv=1;
+ $failed=0;
+ warn "failed, ignore.\n";
+ next;
+ }
+ last;
+ }
$failed = 0;
$failed = 0;
- last;
}
$failed and do {
warn "failed.\n";
}
$failed and do {
warn "failed.\n";
@@
-680,18
+713,19
@@
sub update_feed($$$$)
warn "failed.\n";
return 1;
};
warn "failed.\n";
return 1;
};
- return
0
;
+ return
$rv
;
}
sub update {
my %opts;
my $feed_name;
my $perform_update=1;
}
sub update {
my %opts;
my $feed_name;
my $perform_update=1;
+ my $failed=0;
$ENV{SCAN_COOKIE} = $$;
$ENV{OPENWRT_VERBOSE} = 's';
$ENV{SCAN_COOKIE} = $$;
$ENV{OPENWRT_VERBOSE} = 's';
- getopts('ahi', \%opts);
+ getopts('ahi
f
', \%opts);
if ($opts{h}) {
usage();
if ($opts{h}) {
usage();
@@
-711,8
+745,7
@@
sub update {
if ( ($#ARGV == -1) or $opts{a}) {
foreach my $feed (@feeds) {
my ($type, $name, $src) = @$feed;
if ( ($#ARGV == -1) or $opts{a}) {
foreach my $feed (@feeds) {
my ($type, $name, $src) = @$feed;
- next unless update_feed($type, $name, $src, $perform_update) == 1;
- last;
+ update_feed($type, $name, $src, $perform_update, $opts{f}) == 0 or $failed=1;
}
} else {
while ($feed_name = shift @ARGV) {
}
} else {
while ($feed_name = shift @ARGV) {
@@
-721,14
+754,14
@@
sub update {
if($feed_name ne $name) {
next;
}
if($feed_name ne $name) {
next;
}
- update_feed($type, $name, $src, $perform_update
)
;
+ update_feed($type, $name, $src, $perform_update
, $opts{f}) == 0 or $failed=1
;
}
}
}
refresh_config();
}
}
}
refresh_config();
- return
0
;
+ return
$failed
;
}
sub feed_config() {
}
sub feed_config() {
@@
-758,6
+791,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:
@@
-778,6
+812,7
@@
Commands:
Options:
-a : Update all feeds listed within feeds.conf. Otherwise the specified feeds will be updated.
-i : Recreate the index only. No feed update from repository is performed.
Options:
-a : Update all feeds listed within feeds.conf. Otherwise the specified feeds will be updated.
-i : Recreate the index only. No feed update from repository is performed.
+ -f : Force updating feeds even if there are changed, uncommitted files.
clean: Remove downloaded/generated files.
clean: Remove downloaded/generated files.