my @feeds;
my %build_packages;
my %installed;
+my %installed_targets;
my %feed_cache;
my $feed_package = {};
my $feed_src = {};
+my $feed_target = {};
sub parse_config() {
my $line = 0;
system("$mk -s prepare-mk OPENWRT_BUILD= TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+ system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"targetinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"target\" SCAN_DEPS=\"profiles/*.mk $ENV{TOPDIR}/include/target.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" SCAN_MAKEOPTS=\"TARGET_BUILD=1\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
+ system("ln -sf $name.tmp/.targetinfo ./feeds/$name.targetindex");
return 0;
}
my $name = shift;
my $src = shift;
my $relocate = shift;
-
+
my $m = $update_method{$type};
my $localpath = "./feeds/$name";
my $safepath = $localpath;
} else {
system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
}
-
+
return 0;
}
+sub get_targets($) {
+ my $file = shift;
+ my @target = parse_target_metadata($file);
+ my %target;
+ foreach my $target (@target) {
+ $target{$target->{id}} = $target;
+ }
+ return %target
+}
+
sub get_feed($) {
my $feed = shift;
return;
};
parse_package_metadata($file) or return;
- $feed_cache{$feed} = [ { %package }, { %srcpackage } ];
+ my %target = get_targets("./feeds/$feed.targetindex");
+
+ $feed_cache{$feed} = [ { %package }, { %srcpackage }, { %target } ];
}
$feed_package = $feed_cache{$feed}->[0];
$feed_src = $feed_cache{$feed}->[1];
+ $feed_target = $feed_cache{$feed}->[2];
return $feed_cache{$feed}->[0];
}
clear_packages();
parse_package_metadata("./tmp/.packageinfo");
%installed = %package;
+ %installed_targets = get_targets("./tmp/.targetinfo");
}
sub search_feed {
printf "\%-25s\t\%s\n", $pkg->{name}, $pkg->{title};
};
}
+
+ foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_target) {
+ my $target = $feed_target->{$name};
+ my $targetmatch = 1;
+
+ foreach my $substr (@substr) {
+ my $match;
+ foreach my $key (qw(id name description)) {
+ $target->{$key} and $substr and $target->{$key} =~ m/$substr/i and $match = 1;
+ }
+ $match or undef $targetmatch;
+ };
+ $targetmatch and do {
+ $display or do {
+ print "Search results in feed '$feed':\n";
+ $display = 1;
+ };
+ printf "TARGET: \%-17s\t\%s\n", $target->{id}, $target->{name};
+ };
+ }
return 0;
}
}
}
+ foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_target) {
+ my $target = $feed_target->{$name};
+ if($target->{name}) {
+ printf "TARGET: \%-24s\t\%s\n", $target->{id}, $target->{name};
+ }
+ }
+
return 0;
}
return 0;
}
-sub install_generic() {
+sub do_install_package($$) {
my $feed = shift;
my $pkg = shift;
my $path = $pkg->{makefile};
return 0;
}
-my %install_method = (
- 'src-svn' => \&install_generic,
- 'src-cpy' => \&install_generic,
- 'src-link' => \&install_generic,
- 'src-git' => \&install_generic,
- 'src-gitsvn' => \&install_generic,
- 'src-bzr' => \&install_generic,
- 'src-hg' => \&install_generic,
- 'src-darcs' => \&install_generic,
-);
-
my %feed;
sub lookup_package($$) {
sub install_package {
my $feed = shift;
my $name = shift;
+ my $force = shift;
my $ret = 0;
$feed = lookup_package($feed, $name);
my $type = $feed->[0];
$src or $src = $name;
+ # If it's a core package and we don't want to override, just return
+ !$force and is_core_package($src) and return 0;
+
# previously installed packages set the runtime package
- # newly installed packages set the source package
- $installed{$src} and return 0;
+ # newly installed packages set the source package to 1
+ $installed{$src} and $installed{$src} == 1 and return 0;
+
+ # we'll trigger the override only with the 3 conditions below:
+ # - override is allowed by command line (-f)
+ # - a package with the same src exists in the core packages list
+ # - the package previously installed is not from a feed
+ my $override = 1 if ($force and is_core_package($src) and !$installed{$name}->{feed});
# check previously installed packages
- $installed{$name} and return 0;
+ $installed{$name} and !$override and return 0;
$installed{$src} = 1;
- warn "Installing package '$src'\n";
- $install_method{$type} or do {
- warn "Unknown installation method: '$type'\n";
- return 1;
- };
+ defined($override) and $override == 1
+ and warn "Overriding package '$src'\n"
+ or warn "Installing package '$src'\n";
- &{$install_method{$type}}($feed, $pkg) == 0 or do {
+ do_install_package($feed, $pkg) == 0 or do {
warn "failed.\n";
return 1;
};
$dep =~ s/^.+://;
$dep =~ s/\/.+$//;
next unless $dep;
- install_package($feed, $dep) == 0 or $ret = 1;
+ install_package($feed, $dep, 0) == 0 or $ret = 1;
}
}
my $feed;
my $ret = 0;
- getopts('ap:d:h', \%opts);
+ getopts('ap:d:fh', \%opts);
if ($opts{h}) {
usage();
my $p = $feed_package->{$name};
next if $p->{vdepends};
if( $p->{name} ) {
- install_package($feed, $p->{name}) == 0 or $ret = 1;
+ install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
get_feed($f->[1]);
}
}
}
} else {
while ($name = shift @ARGV) {
- install_package($feed, $name) == 0 or $ret = 1;
+ install_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;
}
}
if ( ($#ARGV == -1) or $opts{a}) {
foreach my $feed (@feeds) {
my ($type, $name, $src) = @$feed;
- update_feed($type, $name, $src, $perform_update);
+ next unless update_feed($type, $name, $src, $perform_update) == 1;
+ last;
}
} else {
while ($feed_name = shift @ARGV) {
-a : Install all packages from all feeds or from the specified feed using the -p option.
-p <feedname>: Prefer this feed when installing packages.
-d <y|m|n>: Set default for newly installed packages.
+ -f : Install will be forced even if the package exists in core OpenWrt (override)
search [options] <substring>: Search for a package
Options: