$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
$ENV{GREP_OPTIONS}="";
-my $mk=`which gmake 2>/dev/null`; # select the right 'make' program
+my $mk=`command -v gmake 2>/dev/null`; # select the right 'make' program
chomp($mk); # trim trailing newline
$mk or $mk = "make"; # default to 'make'
'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)",
'post_update' => "git submodule update --init --recursive",
'controldir' => ".git",
- 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},
+ 'revision' => "git rev-parse 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",
- 'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)",
+ 'update' => "git pull --ff-only",
+ 'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)",
'post_update' => "git submodule update --init --recursive",
'controldir' => ".git",
- 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},
+ 'revision' => "git rev-parse HEAD | tr -d '\n'"},
'src-gitsvn' => {
'init' => "git svn clone -r HEAD '%s' '%s'",
'update' => "git svn rebase",
'controldir' => ".git",
- 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},
+ 'revision' => "git rev-parse HEAD | tr -d '\n'"},
'src-bzr' => {
'init' => "bzr checkout --lightweight '%s' '%s'",
'update' => "bzr update",
$path =~ s/\/Makefile$//;
my $name = $path;
$name =~ s/.*\///;
- my $dest = "./target/linux/$name";
+ my $dest = "./target/linux/feeds/$name";
+
+ -d "./target/linux/feeds" or mkdir "./target/linux/feeds";
-e $dest and do {
warn "Path $dest already exists";
return 1;
};
- system("ln -sf ../../$path ./target/linux/");
+ system("ln -sf ../../../$path ./target/linux/feeds/");
} else {
warn "Target is not valid\n";
return 1;
sub install_target {
my $feed = shift;
my $name = shift;
+ my $force = shift;
+
+ $feed = lookup_target($feed, $name);
+ my $feed_name = $feed->[1];
- $installed_targets{$name} and return 0;
+ -e "target/linux/feeds/$name" and return 0;
+
+ # enable force flag if feed src line was declared with --force
+ if (exists($feed->[3]{force})) {
+ $force = 1;
+ }
- $feed = $feed_cache{$feed->[1]}->[2];
+ $feed = $feed_cache{$feed_name}->[2];
$feed or return 0;
my $target = $feed->{$name};
$target or return 0;
- warn "Installing target '$name'\n";
+ if (-e "target/linux/$name") {
+ if ($force) {
+ warn "Overriding target '$name' with version from '$feed_name'\n";
+ } else {
+ warn "WARNING: Not overriding core target '$name'; use -f to force\n";
+ return 0;
+ }
+ } else {
+ warn "Installing target '$name'\n";
+ }
return do_install_target($target);
}
my $force = shift;
lookup_target($feed, $name) and do {
- return install_target($feed, $name);
+ return install_target($feed, $name, $force);
};
lookup_src($feed, $name) and do {
}
get_installed();
while ($name = shift @ARGV) {
- my $target = "target/linux/$name";
+ my $target = "target/linux/feeds/$name";
-l "$target" and do {
uninstall_target($target);
$uninstall = 1;
return 0;
}
-sub update_feed($$$$$)
+sub update_feed($$$$)
{
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 $rv=0;
warn "Unknown type '$type' in feed $name\n";
return 1;
};
- $perform_update and do {
- my $failed = 1;
- foreach my $feedsrc (@$src) {
- warn "Updating feed '$name' from '$feedsrc' ...\n";
- 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;
+
+ my $failed = 1;
+ foreach my $feedsrc (@$src) {
+ warn "Updating feed '$name' from '$feedsrc' ...\n";
+ if (update_feed_via($type, $name, $feedsrc, $force_relocate, $force_update) != 0) {
+ if ($force_update) {
+ $rv=1;
+ $failed=0;
+ warn "failed, ignore.\n";
+ next;
}
- $failed = 0;
+ last;
}
- $failed and do {
- warn "failed.\n";
- return 1;
- };
- };
- warn "Create index file './feeds/$name.index' \n";
- update_index($name) == 0 or do {
+ $failed = 0;
+ }
+ $failed and do {
warn "failed.\n";
return 1;
};
sub update {
my %opts;
- my $feed_name;
- my $perform_update=1;
+ my %argv_feeds;
my $failed=0;
$ENV{SCAN_COOKIE} = $$;
$ENV{OPENWRT_VERBOSE} = 's';
getopts('ahif', \%opts);
+ %argv_feeds = map { $_ => 1 } @ARGV;
if ($opts{h}) {
usage();
return 0;
}
- if ($opts{i}) {
- # don't update from (remote) repository
- # only re-create index information
- $perform_update=0;
- }
-
-d "feeds" or do {
mkdir "feeds" or die "Unable to create the feeds directory";
};
- if ( ($#ARGV == -1) or $opts{a}) {
- foreach my $feed (@feeds) {
- my ($type, $name, $src) = @$feed;
- update_feed($type, $name, $src, $perform_update, $opts{f}) == 0 or $failed=1;
- }
- } else {
- while ($feed_name = shift @ARGV) {
- foreach my $feed (@feeds) {
- my ($type, $name, $src) = @$feed;
- if($feed_name ne $name) {
- next;
- }
- update_feed($type, $name, $src, $perform_update, $opts{f}) == 0 or $failed=1;
- }
+ my @index_feeds;
+ foreach my $feed (@feeds) {
+ my ($type, $name, $src) = @$feed;
+ next unless $#ARGV == -1 or $opts{a} or $argv_feeds{$name};
+ if (not $opts{i}) {
+ update_feed($type, $name, $src, $opts{f}) == 0 or $failed=1;
}
+ push @index_feeds, $name;
+ }
+ foreach my $name (@index_feeds) {
+ warn "Create index file './feeds/$name.index' \n";
+ update_index($name) == 0 or do {
+ warn "failed.\n";
+ $failed=1;
+ };
}
refresh_config();
'uninstall' => \&uninstall,
'feed_config' => \&feed_config,
'clean' => sub {
- system("rm -rf ./feeds ./package/feeds");
+ system("rm -rf ./feeds ./package/feeds ./target/linux/feeds");
}
);