kernel: fix kmod-usb-phy-omap-usb2

[openwrt/openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 6e30b5a20f03da902a9fa54bebec6ce5e55e96f9..785be385a9038983e5281ba9ca5726422fdf1c5e 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -366,7 +366,29 @@ sub do_install_package($$) {
        return 0;
 }
 
-my %feed;
+sub do_install_target($) {
+       my $target = shift;
+       my $path = $target->{makefile};
+
+       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 "Package is not valid\n";
+               return 1;
+       }
+
+       return 0;
+}
 
 sub lookup_package($$) {
        my $feed = shift;
@@ -374,8 +396,20 @@ sub lookup_package($$) {
 
        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;
 }
@@ -389,12 +423,33 @@ sub is_core_package($) {
        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;
 
+       $feed = lookup_target($feed, $name);
+       $feed and do {
+               $installed_targets{$name} and return 0;
+               install_target($feed, $name);
+               return 0;
+       };
+
        $feed = lookup_package($feed, $name);
        $feed or do {
                $installed{$name} and return 0;
@@ -404,9 +459,9 @@ sub install_package {
        };
 
        # 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
@@ -488,8 +543,8 @@ sub install {
        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;
@@ -526,6 +581,17 @@ sub install {
        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;
@@ -540,6 +606,10 @@ sub uninstall {
 
        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) {
@@ -548,6 +618,13 @@ sub uninstall {
                }
                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";