brcm2708-gpu-fw: update to latest version

[openwrt/openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 383a0d80d90bac2779e736548d960340000377fe..045835c0cc3a09436c4684e403041e0dcf5ff59d 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl

 use Getopt::Std;
 use FindBin;
 use Cwd;
 use Getopt::Std;
 use FindBin;
 use Cwd;


@@ -11,6 +11,7 @@ use Cwd 'abs_path';
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
 $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
 $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";

+$ENV{GREP_OPTIONS}="";

 
 my $mk=`which gmake 2>/dev/null`;      # select the right 'make' program
 chomp($mk);            # trim trailing newline
 
 my $mk=`which gmake 2>/dev/null`;      # select the right 'make' program
 chomp($mk);            # trim trailing newline


@@ -21,16 +22,21 @@ my @mkver = split /\s+/, `$mk -v`, 4;
 my $valid_mk = 1;
 $mkver[0] =~ /^GNU/ or $valid_mk = 0;
 $mkver[1] =~ /^Make/ or $valid_mk = 0;
 my $valid_mk = 1;
 $mkver[0] =~ /^GNU/ or $valid_mk = 0;
 $mkver[1] =~ /^Make/ or $valid_mk = 0;

-$mkver[2] >= "3.81" or $valid_mk = 0;
+
+my ($mkv1, $mkv2) = split /\./, $mkver[2];
+($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0;
+

 $valid_mk or die "Unsupported version of make found: $mk\n";
 
 my @feeds;
 my %build_packages;
 my %installed;
 $valid_mk or die "Unsupported version of make found: $mk\n";
 
 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;


@@ -48,7 +54,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";


@@ -97,7 +103,9 @@ sub update_index($)
 
        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 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("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
        system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");

+       system("ln -sf $name.tmp/.targetinfo ./feeds/$name.targetindex");

 
        return 0;
 }
 
        return 0;
 }


@@ -119,7 +127,15 @@ my %update_method = (
        'src-git' => {
                'init'          => "git clone --depth 1 '%s' '%s'",
                'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
        'src-git' => {
                'init'          => "git clone --depth 1 '%s' '%s'",
                'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",

-               'update'        => "git pull",
+               '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-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' => {
                'controldir'    => ".git",
                'revision'      => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
        'src-gitsvn' => {


@@ -149,27 +165,42 @@ sub update_feed_via($$$$) {
        my $name = shift;
        my $src = shift;
        my $relocate = shift;
        my $name = shift;
        my $src = shift;
        my $relocate = shift;

-       
+

        my $m = $update_method{$type};
        my $localpath = "./feeds/$name";
        my $safepath = $localpath;
        $safepath =~ s/'/'\\''/;
        my $m = $update_method{$type};
        my $localpath = "./feeds/$name";
        my $safepath = $localpath;
        $safepath =~ s/'/'\\''/;

-       my ($base, $branch) = split(/;/, $src, 2);
+       my ($base_branch, $branch) = split(/;/, $src, 2);
+       my ($base_commit, $commit) = split(/\^/, $src, 2);

 
        if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
                system("rm -rf '$safepath'");
                if ($m->{'init_branch'} and $branch) {
 
        if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
                system("rm -rf '$safepath'");
                if ($m->{'init_branch'} and $branch) {

-                       system(sprintf($m->{'init_branch'}, $branch, $base, $safepath)) == 0 or return 1;
+                       system(sprintf($m->{'init_branch'}, $branch, $base_branch, $safepath)) == 0 or return 1;
+               } elsif ($m->{'init_commit'} and $commit) {
+                       system(sprintf($m->{'init_commit'}, $base_commit, $safepath, $safepath, $commit, $commit)) == 0 or return 1;

                } else {
                        system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
                }
                } else {
                        system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
                }

+       } elsif ($m->{'init_commit'} and $commit) {
+               # in case git hash has been provided don't update the feed

        } else {
                system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
        }
        } else {
                system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
        }

-       
+

        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;
 


@@ -182,11 +213,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];
 }
 


@@ -195,6 +229,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 {


@@ -225,6 +260,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;
 }
 


@@ -249,17 +304,30 @@ 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;
 }
 
 sub list {
        my %opts;
 
        return 0;
 }
 
 sub list {
        my %opts;
 

-       getopts('r:d:sh', \%opts);
+       getopts('r:d:nshf', \%opts);

        if ($opts{h}) {
                usage();
                return 0;
        }
        if ($opts{h}) {
                usage();
                return 0;
        }

+       if ($opts{n}) {
+               foreach my $feed (@feeds) {
+                       printf "%s\n", $feed->[1];
+               }
+               return 0;
+       }

        if ($opts{s}) {
                foreach my $feed (@feeds) {
                        my $localpath = "./feeds/$feed->[1]";
        if ($opts{s}) {
                foreach my $feed (@feeds) {
                        my $localpath = "./feeds/$feed->[1]";


@@ -277,6 +345,14 @@ sub list {
                        if ($opts{d}) {
                                printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]});
                        }
                        if ($opts{d}) {
                                printf "%s%s%s%s%s%s%s\n", $feed->[1], $opts{d}, $feed->[0], $opts{d}, $revision, $opts{d}, join(", ", @{$feed->[2]});
                        }

+                       elsif ($opts{f}) {
+                               my $uri = join(", ", @{$feed->[2]});
+                               if ($revision ne "local" && $revision ne "X") {
+                                       $uri =~ s/[;^].*//;
+                                       $uri .= "^" . $revision;
+                               }
+                               printf "%s %s %s\n", $feed->[0], $feed->[1], $uri;
+                       }

                        else {
                                printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
                        }
                        else {
                                printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
                        }


@@ -289,7 +365,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};


@@ -308,18 +384,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};
+
+       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;
+       }

 
 

-my %feed;
+       return 0;
+}

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


@@ -327,8 +414,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;
 }


@@ -342,11 +441,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;
 sub install_package {
        my $feed = shift;
        my $name = shift;

+       my $force = shift;

        my $ret = 0;
 
        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;


@@ -356,9 +477,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


@@ -369,21 +490,28 @@ sub install_package {
        my $type = $feed->[0];
        $src or $src = $name;
 
        my $type = $feed->[0];
        $src or $src = $name;
 

+       # 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
        # previously installed packages set the runtime package

-       # newly installed packages set the source package
-       $installed{$src} and return 0;
+       # newly installed packages set the source package to 1
+       $installed{$src} and $installed{$src} == 1 and return 0;
+
+       # 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});

 
        # check previously installed packages
 
        # check previously installed packages

-       $installed{$name} and return 0;
+       $installed{$name} and !$override and return 0;

        $installed{$src} = 1;
        $installed{$src} = 1;

-       warn "Installing package '$src'\n";

 
 

-       $install_method{$type} or do {
-               warn "Unknown installation method: '$type'\n";
-               return 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";

 
 

-       &{$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;
        };


@@ -396,7 +524,7 @@ sub install_package {
                        $dep =~ s/^.+://;
                        $dep =~ s/\/.+$//;
                        next unless $dep;
                        $dep =~ s/^.+://;
                        $dep =~ s/\/.+$//;
                        next unless $dep;

-                       install_package($feed, $dep) == 0 or $ret = 1;
+                       install_package($feed, $dep, 0) == 0 or $ret = 1;

                }
        }
 
                }
        }
 


@@ -406,6 +534,11 @@ sub install_package {
 sub refresh_config {
        my $default = shift;
 
 sub refresh_config {
        my $default = shift;
 

+       # Don't create .config if it doesn't already exist so that making a
+       # config only occurs when the user intends it do (however we do
+       # want to refresh an existing config).
+       return if not (-e '.config');
+

        # workaround for timestamp check
        system("rm -f tmp/.packageinfo");
 
        # workaround for timestamp check
        system("rm -f tmp/.packageinfo");
 


@@ -423,7 +556,7 @@ sub install {
        my $feed;
        my $ret = 0;
 
        my $feed;
        my $ret = 0;
 

-       getopts('ap:d:h', \%opts);
+       getopts('ap:d:fh', \%opts);

 
        if ($opts{h}) {
                usage();
 
        if ($opts{h}) {
                usage();


@@ -433,8 +566,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;


@@ -449,7 +582,7 @@ sub install {
                                        my $p = $feed_package->{$name};
                                        next if $p->{vdepends};
                                        if( $p->{name} ) {
                                        my $p = $feed_package->{$name};
                                        next if $p->{vdepends};
                                        if( $p->{name} ) {

-                                               install_package($feed, $p->{name}) == 0 or $ret = 1;
+                                               install_package($feed, $p->{name}, exists($opts{f})) == 0 or $ret = 1;

                                                get_feed($f->[1]);
                                        }
                                }
                                                get_feed($f->[1]);
                                        }
                                }


@@ -457,7 +590,7 @@ sub install {
                }
        } else {
                while ($name = shift @ARGV) {
                }
        } else {
                while ($name = shift @ARGV) {

-                       install_package($feed, $name) == 0 or $ret = 1;
+                       install_package($feed, $name, exists($opts{f})) == 0 or $ret = 1;

                }
        }
 
                }
        }
 


@@ -471,6 +604,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;


@@ -485,6 +629,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) {


@@ -493,6 +641,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";


@@ -548,6 +703,7 @@ sub update {
        my %opts;
        my $feed_name;
        my $perform_update=1;
        my %opts;
        my $feed_name;
        my $perform_update=1;

+       my $failed=0;

 
        $ENV{SCAN_COOKIE} = $$;
        $ENV{OPENWRT_VERBOSE} = 's';
 
        $ENV{SCAN_COOKIE} = $$;
        $ENV{OPENWRT_VERBOSE} = 's';


@@ -572,7 +728,7 @@ sub update {
        if ( ($#ARGV == -1) or $opts{a}) {
                foreach my $feed (@feeds) {
                        my ($type, $name, $src) = @$feed;
        if ( ($#ARGV == -1) or $opts{a}) {
                foreach my $feed (@feeds) {
                        my ($type, $name, $src) = @$feed;

-                       update_feed($type, $name, $src, $perform_update);
+                       update_feed($type, $name, $src, $perform_update) == 0 or $failed=1;

                }
        } else {
                while ($feed_name = shift @ARGV) {
                }
        } else {
                while ($feed_name = shift @ARGV) {


@@ -581,13 +737,29 @@ sub update {
                                if($feed_name ne $name) {
                                        next;
                                }
                                if($feed_name ne $name) {
                                        next;
                                }

-                               update_feed($type, $name, $src, $perform_update);
+                               update_feed($type, $name, $src, $perform_update) == 0 or $failed=1;

                        }
                }
        }
 
        refresh_config();
 
                        }
                }
        }
 
        refresh_config();
 

+       return $failed;
+}
+
+sub feed_config() {
+       foreach my $feed (@feeds) {
+               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\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 "\n";
+       }
+

        return 0;
 }
 
        return 0;
 }
 


@@ -598,15 +770,18 @@ Usage: $0 <command> [options]
 Commands:
        list [options]: List feeds, their content and revisions (if installed)
        Options:
 Commands:
        list [options]: List feeds, their content and revisions (if installed)
        Options:

+           -n :            List of feed names.

            -s :            List of feed names and their URL.
            -r <feedname>:  List packages of specified feed.
            -d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)
            -s :            List of feed names and their URL.
            -r <feedname>:  List packages of specified feed.
            -d <delimiter>: Use specified delimiter to distinguish rows (default: spaces)

+           -f :            List feeds in feeds.conf compatible format (when using -s).

 
        install [options] <package>: Install a package
        Options:
            -a :           Install all packages from all feeds or from the specified feed using the -p option.
            -p <feedname>: Prefer this feed when installing packages.
            -d <y|m|n>:    Set default for newly installed packages.
 
        install [options] <package>: Install a package
        Options:
            -a :           Install all packages from all feeds or from the specified feed using the -p option.
            -p <feedname>: Prefer this feed when installing packages.
            -d <y|m|n>:    Set default for newly installed packages.

+           -f :           Install will be forced even if the package exists in core OpenWrt (override)

 
        search [options] <substring>: Search for a package
        Options:
 
        search [options] <substring>: Search for a package
        Options:


@@ -633,8 +808,9 @@ my %commands = (
        'install' => \&install,
        'search' => \&search,
        'uninstall' => \&uninstall,
        'install' => \&install,
        'search' => \&search,
        'uninstall' => \&uninstall,

+       'feed_config' => \&feed_config,

        'clean' => sub {
        'clean' => sub {

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

        }
 );
 
        }
 );