linux/au1000: fix jffs2/squashfs au1500 boot issue (deals with ticket #8058)

[openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index f2ffc3e..43c5c6d 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -221,7 +221,7 @@ sub list_feed {
        my $feed = shift;
 
        get_feed($feed);
        my $feed = shift;
 
        get_feed($feed);

-       foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
+       foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {

                my $pkg = $feed_package->{$name};
                next if $pkg->{vdepends};
                if($pkg->{name}) {
                my $pkg = $feed_package->{$name};
                next if $pkg->{vdepends};
                if($pkg->{name}) {


@@ -307,6 +307,9 @@ sub install_package {
                return 0;
        };
 
                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;
        my $pkg = $feed{$feed->[1]}->{$name} or return 1;
        $pkg->{name} or do {
                $installed{$name} and return 0;


@@ -337,8 +340,8 @@ sub install_package {
                return 1;
        };
 
                return 1;
        };
 

-       # install all dependencies
-       foreach my $vpkg (@{$feed_src->{$src}}, $pkg) {
+       # 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/^\+//;
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;


@@ -394,11 +397,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]);
                        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) {
+                               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;
                                        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]);

                                        }
                                }
                        }
                                        }
                                }
                        }