[backfire] merge r26988

[openwrt-10.03/.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index deafaca126c6fd89cadf97715f30c506c4a6c63c..ba060b8089945b43be795ce7cbd9aa58dce1441b 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -26,6 +26,10 @@ $valid_mk or die "Unsupported version of make found: $mk\n";
 my @feeds;
 my %build_packages;
 my %installed;
+my %feed_cache;
+
+my $feed_package = {};
+my $feed_src = {};
 
 sub parse_config() {
        my $line = 0;
@@ -46,7 +50,7 @@ sub parse_config() {
                $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.list, line: $line\n";
+               $valid or die "Syntax error in feeds.conf, line: $line\n";
 
                $name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
                $name{$line[1]} = 1;
@@ -110,8 +114,13 @@ my %update_method = (
                'update'        => ""},
        'src-git' => {
                'init'          => "git clone --depth 1 '%s' '%s'",
+               'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
                'update'        => "git pull",
                'controldir'    => ".git"},
+       'src-gitsvn' => {
+                'init'          => "git svn clone -r HEAD '%s' '%s'",
+                'update'        => "git svn rebase",
+                'controldir'    => ".git"},
        'src-bzr' => {
                'init'          => "bzr checkout --lightweight '%s' '%s'",
                'update'        => "bzr update",
@@ -135,10 +144,15 @@ sub update_feed_via($$$$) {
        my $localpath = "./feeds/$name";
        my $safepath = $localpath;
        $safepath =~ s/'/'\\''/;
+       my ($base, $branch) = split(/;/, $src, 2);
 
        if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
                system("rm -rf '$safepath'");
-               system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+               if ($m->{'init_branch'} and $branch) {
+                       system(sprintf($m->{'init_branch'}, $branch, $base, $safepath)) == 0 or return 1;
+               } else {
+                       system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+               }
        } else {
                system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
        }
@@ -148,16 +162,22 @@ sub update_feed_via($$$$) {
 
 sub get_feed($) {
        my $feed = shift;
-       my $file = "./feeds/$feed.index";
 
-       clear_packages();
+       if (!defined($feed_cache{$feed})) {
+               my $file = "./feeds/$feed.index";
 
-       -f $file or do {
-               print "Ignoring feed '$feed' - index missing\n";
-               return;
-       };
-       parse_package_metadata($file) or return;
-       return { %package };
+               clear_packages();
+               -f $file or do {
+                       print "Ignoring feed '$feed' - index missing\n";
+                       return;
+               };
+               parse_package_metadata($file) or return;
+               $feed_cache{$feed} = [ { %package }, { %srcpackage } ];
+       }
+
+       $feed_package = $feed_cache{$feed}->[0];
+       $feed_src = $feed_cache{$feed}->[1];
+       return $feed_cache{$feed}->[0];
 }
 
 sub get_installed() {
@@ -174,11 +194,12 @@ sub search_feed {
 
        return unless @substr > 0;
        get_feed($feed);
-       foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
-               my $pkg = $package{$name};
+       foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
+               my $pkg = $feed_package->{$name};
                my $substr;
                my $pkgmatch = 1;
 
+               next if $pkg->{vdepends};
                foreach my $substr (@substr) {
                        my $match;
                        foreach my $key (qw(name title description src)) {
@@ -210,8 +231,9 @@ sub list_feed {
        my $feed = shift;
 
        get_feed($feed);
-       foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
-               my $pkg = $package{$name};
+       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};
                }
@@ -264,6 +286,7 @@ my %install_method = (
        'src-cpy' => \&install_generic,
        'src-link' => \&install_generic,
        'src-git' => \&install_generic,
+       'src-gitsvn' => \&install_generic,
        'src-bzr' => \&install_generic,
        'src-hg' => \&install_generic,
 );
@@ -291,10 +314,13 @@ sub install_package {
        $feed or do {
                $installed{$name} and return 0;
                # TODO: check if it's already installed within ./package directory
-               $srcpackage{$name} or -d "./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 -d "./package/$name" or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
                return 0;
        };
 
+       # switch to the metadata for the selected feed
+       get_feed($feed->[1]);
+
        my $pkg = $feed{$feed->[1]}->{$name} or return 1;
        $pkg->{name} or do {
                $installed{$name} and return 0;
@@ -325,12 +351,13 @@ sub install_package {
                return 1;
        };
 
-       # install all dependencies
-       foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
-               foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+       # install all dependencies referenced from the source package
+       foreach my $vpkg (@{$feed_src->{$src}}) {
+               foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;
                        $dep =~ s/^.+://;
+                       $dep =~ s/\/.+$//;
                        next unless $dep;
                        install_package($feed, $dep) == 0 or $ret = 1;
                }
@@ -381,10 +408,12 @@ sub install {
                        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 %package) {
-                                       my $p = $package{$name};
+                               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}) == 0 or $ret = 1;
+                                               get_feed($f->[1]);
                                        }
                                }
                        }