my @feeds;
my %build_packages;
my %installed;
+my %installed_pkg;
my %installed_targets;
my %feed_cache;
my $feed_package = {};
my $feed_src = {};
my $feed_target = {};
+my $feed_vpackage = {};
-sub parse_config() {
+sub parse_file($$);
+
+sub parse_file($$) {
+ my ($fname, $existing) = @_;
my $line = 0;
- my %name;
+ my $fh;
- open FEEDS, "feeds.conf" or
- open FEEDS, "feeds.conf.default" or
- die "Unable to open feeds configuration";
- while (<FEEDS>) {
+ open $fh, $fname or return undef;
+ while (<$fh>) {
chomp;
s/#.+$//;
- next unless /\S/;
- my @line = split /\s+/, $_, 3;
- my @src;
$line++;
+ next unless /\S/;
- my $valid = 1;
- $line[0] =~ /^src-[\w-]+$/ or $valid = 0;
- $line[1] =~ /^\w+$/ or $valid = 0;
- @src = split /\s+/, $line[2];
- $valid or die "Syntax error in feeds.conf, line: $line\n";
+ my ($type, $flags, $name, $urls) = m!^src-(\w+)((?:\s+--\w+(?:=\S+)?)*)\s+(\w+)(?:\s+(\S.*))?$!;
+ unless ($type && $name) {
+ die "Syntax error in $fname, line $line\n";
+ }
- $name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
- $name{$line[1]} = 1;
+ if ($existing->{$name}++) {
+ die "Duplicate feed name '$name' in '$fname' line: $line\n";
+ }
+
+ my @src = defined($urls) ? split /\s+/, $urls : ();
+ push @src, '' if @src == 0;
+
+ my %flags;
+ if (defined $flags) {
+ while ($flags =~ m!\s+--(\w+)(?:=(\S+))?!g) {
+ $flags{$1} = defined($2) ? $2 : 1;
+ }
+ }
- push @feeds, [$line[0], $line[1], \@src];
+ if ($type eq "include") {
+ parse_file($urls, $existing) or
+ die "Unable to open included file '$urls'";
+ next;
+ }
+
+ push @feeds, ["src-$type", $name, \@src, \%flags];
}
- close FEEDS;
+ close $fh;
+ return 1;
+}
+
+sub parse_config() {
+ my %name;
+ parse_file("feeds.conf", \%name) or
+ parse_file("feeds.conf.default", \%name) or
+ die "Unable to open feeds configuration";
}
sub update_location($$)
-d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
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("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" 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_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");
'init' => "ln -s '%s' '%s'",
'update' => "",
'revision' => "echo -n 'local'"},
+ 'src-dummy' => {
+ 'init' => "true '%s' && mkdir '%s'",
+ 'update' => "",
+ 'revision' => "echo -n 'dummy'"},
'src-git' => {
'init' => "git clone --depth 1 '%s' '%s'",
'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)",
+ 'post_update' => "git submodule update --init --recursive",
'controldir' => ".git",
'revision' => "git rev-parse --short HEAD | tr -d '\n'"},
'src-git-full' => {
'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)",
+ 'post_update' => "git submodule update --init --recursive",
'controldir' => ".git",
'revision' => "git rev-parse --short HEAD | tr -d '\n'"},
'src-gitsvn' => {
}
system("cd '$safepath'; $update_cmd") == 0 or return 1;
}
+ if ($m->{'post_update'}) {
+ my $cmd = $m->{'post_update'};
+ system("cd '$safepath'; $cmd") == 0 or return 1;
+ }
return 0;
}
parse_package_metadata($file) or return;
my %target = get_targets("./feeds/$feed.targetindex");
- $feed_cache{$feed} = [ { %package }, { %srcpackage }, { %target } ];
+ $feed_cache{$feed} = [ { %package }, { %srcpackage }, { %target }, { %vpackage } ];
}
$feed_package = $feed_cache{$feed}->[0];
$feed_src = $feed_cache{$feed}->[1];
$feed_target = $feed_cache{$feed}->[2];
- return $feed_cache{$feed}->[0];
+ $feed_vpackage = $feed_cache{$feed}->[3];
}
sub get_installed() {
system("$mk -s prepare-tmpinfo OPENWRT_BUILD=");
clear_packages();
parse_package_metadata("./tmp/.packageinfo");
- %installed = %package;
+ %installed_pkg = %vpackage;
+ %installed = %srcpackage;
%installed_targets = get_targets("./tmp/.targetinfo");
}
my $substr;
my $pkgmatch = 1;
- next if $pkg->{vdepends};
foreach my $substr (@substr) {
my $match;
foreach my $key (qw(name title description src)) {
get_feed($feed);
foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
my $pkg = $feed_package->{$name};
- next if $pkg->{vdepends};
if($pkg->{name}) {
printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
}
return 0;
}
-sub do_install_package($$) {
+sub do_install_src($$) {
my $feed = shift;
- my $pkg = shift;
- my $path = $pkg->{makefile};
+ my $src = shift;
- if($path) {
+ my $path = $src->{makefile};
+ if ($path) {
$path =~ s/\/Makefile$//;
-d "./package/feeds" or mkdir "./package/feeds";
return 0;
}
+sub lookup_src($$) {
+ my $feed = shift;
+ my $src = shift;
+
+ foreach my $feed ($feed, @feeds) {
+ next unless $feed->[1];
+ next unless $feed_cache{$feed->[1]};
+ $feed_cache{$feed->[1]}->[1]->{$src} and return $feed;
+ }
+ return;
+}
+
sub lookup_package($$) {
my $feed = shift;
my $package = shift;
foreach my $feed ($feed, @feeds) {
next unless $feed->[1];
next unless $feed_cache{$feed->[1]};
- $feed_cache{$feed->[1]}->[0]->{$package} and return $feed;
+ $feed_cache{$feed->[1]}->[3]->{$package} and return $feed;
}
return;
}
return;
}
-sub is_core_package($) {
- my $package = shift;
- foreach my $file ("tmp/info/.packageinfo-$package", glob("tmp/info/.packageinfo-*_$package")) {
+sub is_core_src($) {
+ my $src = shift;
+ foreach my $file ("tmp/info/.packageinfo-$src", glob("tmp/info/.packageinfo-*_$src")) {
next unless index($file, "tmp/info/.packageinfo-feeds_");
return 1 if -s $file;
}
my $feed = shift;
my $name = shift;
+ $installed_targets{$name} and return 0;
+
$feed = $feed_cache{$feed->[1]}->[2];
$feed or return 0;
return do_install_target($target);
}
-sub install_package {
+sub install_src {
my $feed = shift;
my $name = shift;
my $force = shift;
my $ret = 0;
- my $this_feed_target = lookup_target($feed, $name);
- $this_feed_target and do {
- $installed_targets{$name} and return 0;
- install_target($this_feed_target, $name);
- return 0;
- };
-
- $feed = lookup_package($feed, $name);
- $feed or do {
+ $feed = lookup_src($feed, $name);
+ unless ($feed) {
$installed{$name} and return 0;
- # TODO: check if it's already installed within ./package directory
- $feed_src->{$name} or is_core_package($name) or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
+ $feed_src->{$name} or warn "WARNING: No feed for source package '$name' found\n";
return 0;
- };
+ }
# switch to the metadata for the selected feed
- my $cur = get_feed($feed->[1]);
+ get_feed($feed->[1]);
+ my $src = $feed_src->{$name} or return 1;
- my $pkg = $cur->{$name} or return 1;
- $pkg->{name} or do {
- $installed{$name} and return 0;
- # TODO: check if this is an alias package, maybe it's known by another name
- warn "WARNING: Package '$name' is not available in feed $feed->[1].\n";
- return 0;
- };
- my $src = $pkg->{src}{name};
- my $type = $feed->[0];
- $src or $src = $name;
+ # enable force flag if feed src line was declared with --force
+ if (exists($feed->[3]{force})) {
+ $force = 1;
+ }
# 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 to 1
- $installed{$src} and $installed{$src} == 1 and return 0;
+ my $override = 0;
+ if (is_core_src($name)) {
+ return 0 unless $force;
+ $override = 1;
+ }
- # 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});
+ if ($installed{$name}) {
+ # newly installed packages set the source package to 1
+ return 0 if ($installed{$name} == 1);
+ return 0 unless ($override);
+ }
- # check previously installed packages
- $installed{$name} and !$override and return 0;
- $installed{$src} = 1;
+ $installed{$name} = 1;
+ foreach my $pkg (@{$src->{packages}}) {
+ foreach my $vpkg (@{$pkg->{provides}}) {
+ $installed_pkg{$vpkg} = 1;
+ }
+ }
- defined($override) and $override == 1
- and warn "Overriding core package '$src' with version from $feed->[1]\n"
- or warn "Installing package '$src' from $feed->[1]\n";
+ if ($override) {
+ warn "Overriding core package '$name' with version from $feed->[1]\n";
+ } else {
+ warn "Installing package '$name' from $feed->[1]\n";
+ }
- do_install_package($feed, $pkg) == 0 or do {
+ do_install_src($feed, $src) == 0 or do {
warn "failed.\n";
return 1;
};
# install all dependencies referenced from the source package
foreach my $dep (
- @{$feed_src->{$src}{builddepends}},
- @{$feed_src->{$src}{"builddepends/host"}},
- map { @{$_->{depends}} } @{$feed_src->{$src}{packages}}
+ @{$src->{builddepends}},
+ @{$src->{'builddepends/host'}},
) {
next if $dep =~ /@/;
- $dep =~ s/^\+//;
$dep =~ s/^.+://;
$dep =~ s/\/.+$//;
next unless $dep;
- install_package($feed, $dep, 0) == 0 or $ret = 1;
+ install_src($feed, $dep, 0) == 0 or $ret = 1;
+ }
+
+ foreach my $pkg (@{$src->{packages}}) {
+ foreach my $dep (@{$pkg->{depends}}) {
+ next if $dep =~ /@/;
+ $dep =~ s/^\+//;
+ $dep =~ s/^.+://;
+ next unless $dep;
+ install_package($feed, $dep, 0) == 0 or $ret = 1;
+ }
}
return $ret;
}
+sub install_package {
+ my $feed = shift;
+ my $name = shift;
+ my $force = shift;
+
+ $feed = lookup_package($feed, $name);
+ unless ($feed) {
+ $installed_pkg{$name} and return 0;
+ $feed_vpackage->{$name} or warn "WARNING: No feed for package '$name' found\n";
+ return 0;
+ }
+
+ # switch to the metadata for the selected feed
+ get_feed($feed->[1]);
+ my $pkg = $feed_vpackage->{$name} or return 1;
+ return install_src($feed, $pkg->[0]{src}{name}, $force);
+}
+
+sub install_target_or_package {
+ my $feed = shift;
+ my $name = shift;
+ my $force = shift;
+
+ my $this_feed_target = lookup_target($feed, $name);
+ $this_feed_target and do {
+ return install_target($this_feed_target, $name);
+ };
+
+ my $this_feed_src = lookup_src($feed, $name);
+ $this_feed_src and do {
+ return install_src($this_feed_src, $name, $force);
+ };
+
+ return install_package($feed, $name, $force);
+}
+
sub refresh_config {
my $default = shift;
if (!defined($opts{p}) or $opts{p} eq $f->[1]) {
printf "Installing all packages from feed %s.\n", $f->[1];
get_feed($f->[1]);
- foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
- my $p = $feed_package->{$name};
- next if $p->{vdepends};
- if( $p->{name} ) {
- install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;
- get_feed($f->[1]);
- }
+ foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_src) {
+ install_src($feed, $name, exists($opts{f})) == 0 or $ret = 1;
+ get_feed($f->[1]);
}
}
}
} else {
while ($name = shift @ARGV) {
- install_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;
+ install_target_or_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;
}
}
my $installed = (-f "feeds/$feed->[1].index");
printf "\tconfig FEED_%s\n", $feed->[1];
- printf "\t\tbool \"Enable feed %s\"\n", $feed->[1];
+ printf "\t\ttristate \"Enable feed %s\"\n", $feed->[1];
printf "\t\tdepends on PER_FEED_REPO\n";
printf "\t\tdefault y\n" if $installed;
printf "\t\thelp\n";
- printf "\t\t Enable the \\\"%s\\\" feed at %s.\n", $feed->[1], $feed->[2][0];
+ printf "\t\t Enable the \\\"%s\\\" feed in opkg distfeeds.conf.\n", $feed->[1];
+ printf "\t\t Say M to add the feed commented out.\n";
printf "\n";
}
projects / openwrt / openwrt.git / blobdiff