scripts/feeds: print the source of packages installed

[openwrt/openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 004e5c9c6a8bd236a3d37c7fc7a8a8a1d55dd6be..7744dd068e6baa268eba594b4154468bd0896d65 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -28,10 +28,12 @@ $valid_mk or die "Unsupported version of make found: $mk\n";
 my @feeds;
 my %build_packages;
 my %installed;
 my @feeds;
 my %build_packages;
 my %installed;

+my %installed_targets;

 my %feed_cache;
 
 my $feed_package = {};
 my $feed_src = {};
 my %feed_cache;
 
 my $feed_package = {};
 my $feed_src = {};

+my $feed_target = {};

 
 sub parse_config() {
        my $line = 0;
 
 sub parse_config() {
        my $line = 0;


@@ -49,7 +51,7 @@ sub parse_config() {
                $line++;
 
                my $valid = 1;
                $line++;
 
                my $valid = 1;

-               $line[0] =~ /^src-\w+$/ or $valid = 0;
+               $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";
                $line[1] =~ /^\w+$/ or $valid = 0;
                @src = split /\s+/, $line[2];
                $valid or die "Syntax error in feeds.conf, line: $line\n";


@@ -126,6 +128,13 @@ my %update_method = (
                'update'        => "git pull --ff",
                'controldir'    => ".git",
                'revision'      => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
                'update'        => "git pull --ff",
                'controldir'    => ".git",
                'revision'      => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | 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",
+               'controldir'    => ".git",
+               'revision'      => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},

        'src-gitsvn' => {
                'init'  => "git svn clone -r HEAD '%s' '%s'",
                'update'        => "git svn rebase",
        'src-gitsvn' => {
                'init'  => "git svn clone -r HEAD '%s' '%s'",
                'update'        => "git svn rebase",


@@ -179,6 +188,16 @@ sub update_feed_via($$$$) {
        return 0;
 }
 
        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;
 
 sub get_feed($) {
        my $feed = shift;
 


@@ -191,11 +210,14 @@ sub get_feed($) {
                        return;
                };
                parse_package_metadata($file) or return;
                        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_package = $feed_cache{$feed}->[0];
        $feed_src = $feed_cache{$feed}->[1];

+       $feed_target = $feed_cache{$feed}->[2];

        return $feed_cache{$feed}->[0];
 }
 
        return $feed_cache{$feed}->[0];
 }
 


@@ -204,6 +226,7 @@ sub get_installed() {
        clear_packages();
        parse_package_metadata("./tmp/.packageinfo");
        %installed = %package;
        clear_packages();
        parse_package_metadata("./tmp/.packageinfo");
        %installed = %package;

+       %installed_targets = get_targets("./tmp/.targetinfo");

 }
 
 sub search_feed {
 }
 
 sub search_feed {


@@ -234,6 +257,26 @@ sub search_feed {
                        printf "\%-25s\t\%s\n", $pkg->{name}, $pkg->{title};
                };
        }
                        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;
 }
 
        return 0;
 }
 


@@ -258,6 +301,13 @@ sub list_feed {
                }
        }
 
                }
        }
 

+       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;
 }
 


@@ -304,7 +354,7 @@ sub list {
        return 0;
 }
 
        return 0;
 }
 

-sub install_generic() {
+sub do_install_package($$) {

        my $feed = shift;
        my $pkg = shift;
        my $path = $pkg->{makefile};
        my $feed = shift;
        my $pkg = shift;
        my $path = $pkg->{makefile};


@@ -323,18 +373,29 @@ sub install_generic() {
        return 0;
 }
 
        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,
-);
+sub do_install_target($) {
+       my $target = shift;
+       my $path = $target->{makefile};

 
 

-my %feed;
+       if ($path) {
+               $path =~ s/\/Makefile$//;
+               my $name = $path;
+               $name =~ s/.*\///;
+               my $dest = "./target/linux/$name";
+
+               -e $dest and do {
+                       warn "Path $dest already exists";
+                       return 1;
+               };
+
+               system("ln -sf ../../$path ./target/linux/");
+       } else {
+               warn "Target is not valid\n";
+               return 1;
+       }
+
+       return 0;
+}

 
 sub lookup_package($$) {
        my $feed = shift;
 
 sub lookup_package($$) {
        my $feed = shift;


@@ -342,8 +403,20 @@ sub lookup_package($$) {
 
        foreach my $feed ($feed, @feeds) {
                next unless $feed->[1];
 
        foreach my $feed ($feed, @feeds) {
                next unless $feed->[1];

-               next unless $feed{$feed->[1]};
-               $feed{$feed->[1]}->{$package} and return $feed;
+               next unless $feed_cache{$feed->[1]};
+               $feed_cache{$feed->[1]}->[0]->{$package} and return $feed;
+       }
+       return;
+}
+
+sub lookup_target($$) {
+       my $feed = shift;
+       my $target = shift;
+
+       foreach my $feed ($feed, @feeds) {
+               next unless $feed->[1];
+               next unless $feed_cache{$feed->[1]};
+               $feed_cache{$feed->[1]}->[2]->{$target} and return $feed;

        }
        return;
 }
        }
        return;
 }


@@ -357,12 +430,33 @@ sub is_core_package($) {
        return 0;
 }
 
        return 0;
 }
 

+sub install_target {
+       my $feed = shift;
+       my $name = shift;
+
+       $feed = $feed_cache{$feed->[1]}->[2];
+       $feed or return 0;
+
+       my $target = $feed->{$name};
+       $target or return 0;
+
+       warn "Installing target '$name'\n";
+       return do_install_target($target);
+}
+

 sub install_package {
        my $feed = shift;
        my $name = shift;
        my $force = shift;
        my $ret = 0;
 
 sub install_package {
        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 {
                $installed{$name} and return 0;
        $feed = lookup_package($feed, $name);
        $feed or do {
                $installed{$name} and return 0;


@@ -372,9 +466,9 @@ sub install_package {
        };
 
        # switch to the metadata for the selected feed
        };
 
        # switch to the metadata for the selected feed

-       get_feed($feed->[1]);
+       my $cur = get_feed($feed->[1]);

 
 

-       my $pkg = $feed{$feed->[1]}->{$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
        $pkg->{name} or do {
                $installed{$name} and return 0;
                # TODO: check if this is an alias package, maybe it's known by another name


@@ -403,15 +497,10 @@ sub install_package {
        $installed{$src} = 1;
 
        defined($override) and $override == 1
        $installed{$src} = 1;
 
        defined($override) and $override == 1

-               and warn "Overriding package '$src'\n"
-               or warn "Installing package '$src'\n";
-
-       $install_method{$type} or do {
-               warn "Unknown installation method: '$type'\n";
-               return 1;
-       };
+               and warn "Overriding core package '$src' with version from $feed->[1]\n"
+               or warn "Installing package '$src' from $feed->[1]\n";

 
 

-       &{$install_method{$type}}($feed, $pkg) == 0 or do {
+       do_install_package($feed, $pkg) == 0 or do {

                warn "failed.\n";
                return 1;
        };
                warn "failed.\n";
                return 1;
        };


@@ -461,8 +550,8 @@ sub install {
        get_installed();
 
        foreach my $f (@feeds) {
        get_installed();
 
        foreach my $f (@feeds) {

-               # index all feeds
-               $feed{$f->[1]} = get_feed($f->[1]);
+               # fetch all feeds
+               get_feed($f->[1]);

 
                # look up the preferred feed
                $opts{p} and $f->[1] eq $opts{p} and $feed = $f;
 
                # look up the preferred feed
                $opts{p} and $f->[1] eq $opts{p} and $feed = $f;


@@ -499,6 +588,17 @@ sub install {
        return $ret;
 }
 
        return $ret;
 }
 

+sub uninstall_target($) {
+       my $dir = shift;
+       my $name = $dir;
+       $name =~ s/.*\///g;
+
+       my $dest = readlink $dir;
+       return unless $dest =~ /..\/..\/feeds/;
+       warn "Uninstalling target '$name'\n";
+       unlink "$dir";
+}
+

 sub uninstall {
        my %opts;
        my $name;
 sub uninstall {
        my %opts;
        my $name;


@@ -513,6 +613,10 @@ sub uninstall {
 
        if ($opts{a}) {
                system("rm -rvf ./package/feeds");
 
        if ($opts{a}) {
                system("rm -rvf ./package/feeds");

+               foreach my $dir (glob "target/linux/*") {
+                       next unless -l $dir;
+                       uninstall_target($dir);
+               }

                $uninstall = 1;
        } else {
                if($#ARGV == -1) {
                $uninstall = 1;
        } else {
                if($#ARGV == -1) {


@@ -521,6 +625,13 @@ sub uninstall {
                }
                get_installed();
                while ($name = shift @ARGV) {
                }
                get_installed();
                while ($name = shift @ARGV) {

+                       my $target = "target/linux/$name";
+                       -l "$target" and do {
+                               uninstall_target($target);
+                               $uninstall = 1;
+                               next;
+                       };
+

                        my $pkg = $installed{$name};
                        $pkg or do {
                                warn "WARNING: $name not installed\n";
                        my $pkg = $installed{$name};
                        $pkg or do {
                                warn "WARNING: $name not installed\n";


@@ -682,7 +793,7 @@ my %commands = (
        'uninstall' => \&uninstall,
        'feed_config' => \&feed_config,
        'clean' => sub {
        'uninstall' => \&uninstall,
        'feed_config' => \&feed_config,
        'clean' => sub {

-               system("rm -rf feeds");
+               system("rm -rf ./feeds ./package/feeds");

        }
 );
 
        }
 );