make the whole iptables/netfiter modular (closes: #3871, #3527)

[openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index ee2f108..099468a 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -102,7 +102,7 @@ sub update_git($$) {
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");

-               system("git-clone --depth 1 $src ./feeds/$name") == 0 or return 1;
+               system("git clone --depth 1 $src ./feeds/$name") == 0 or return 1;

        }
 
        return 0;
        }
 
        return 0;


@@ -286,7 +286,7 @@ sub install_package {
        };
 
        # install all dependencies
        };
 
        # install all dependencies

-       foreach my $vpkg (@{$srcpackage{$src}}) {
+       foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {

                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;