[brcm63xx] add missing patch which fakes a cardbus controller on top of PCI, thanks...

[openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 115fe46..d6a6355 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -15,6 +15,14 @@ my $mk=`which gmake`;        # select the right 'make' program
 chomp($mk);            # trim trailing newline
 $mk or $mk = "make";   # default to 'make'
 
+# check version of make
+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;
+$mkver[2] >= "3.81" or $valid_mk = 0;
+$valid_mk or die "Unsupported version of make found: $mk\n";
+
 my @feeds;
 my %build_packages;
 my %installed;
@@ -72,7 +80,7 @@ sub update_location($$)
                return $old_url ? 1 : 0;
        }
 
-       return 0;       
+       return 0;
 }
 
 sub update_index($)
@@ -89,55 +97,52 @@ sub update_index($)
        return 0;
 }
 
-sub update_svn($$$) {
-       my $name = shift;
-       my $src = shift;
-       my $relocate = shift;
-
-       if ( !$relocate && -d "./feeds/$name/.svn" ) {
-               system("(cd \"./feeds/$name\"; svn up)") == 0 or return 1;
-       } else {
-               system("rm -rf \"./feeds/$name\"");
-               system("svn co $src \"./feeds/$name\"") == 0 or return 1;
-       }
-
-       return 0;
-}
-
-sub update_cpy($$$) {
-       my $name = shift;
-       my $src = shift;
-       my $relocate = shift;
-
-       $relocate && system("rm -rf \"./feeds/$name\"");
-       system("mkdir -p ./feeds/$name");
-       system("cp -Rf $src ./feeds");
+my %update_method = (
+       'src-svn' => {
+               'init'          => "svn checkout '%s' '%s'",
+               'update'        => "svn update",
+               'controldir'    => ".svn"},
+       'src-cpy' => {
+               'init'          => "cp -Rf '%s' '%s'",
+               'update'        => ""},
+       'src-link' => {
+               'init'          => "ln -s '%s' '%s'",
+               'update'        => ""},
+       'src-git' => {
+               'init'          => "git clone --depth 1 '%s' '%s'",
+               'update'        => "git pull",
+               'controldir'    => ".git"},
+       'src-bzr' => {
+               'init'          => "bzr checkout --lightweight '%s' '%s'",
+               'update'        => "bzr update",
+               'controldir'    => ".bzr"},
+       'src-hg' => {
+               'init'          => "hg clone '%s' '%s'",
+               'update'        => "hg pull --update",
+               'controldir'    => ".hg"}
+);
 
-       return 0;
-}
+# src-git: pull broken
+# src-cpy: broken if `basename $src` != $name
 
-sub update_link($$$) {
-       my $name = shift;
-       my $src = abs_path(shift);
-       my $relocate = shift;   # no-op
-
-       system("rm -f ./feeds/$name; ln -s $src ./feeds/$name");
-
-       return 0;
-}
-
-sub update_git($$$) {
+sub update_feed_via($$$$) {
+       my $type = shift;
        my $name = shift;
        my $src = shift;
        my $relocate = shift;
-
-       if ( !$relocate && -d "./feeds/$name/.git" ) {
-               system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
+       
+       my $m = $update_method{$type};
+       my $localpath = "./feeds/$name";
+       my $safepath = $localpath;
+       $safepath =~ s/'/'\\''/;
+
+       if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
+               system("rm -rf '$safepath'");
+               system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
        } else {
-               system("rm -rf \"./feeds/$name\"");
-               system("git clone --depth 1 $src ./feeds/$name") == 0 or return 1;
+               system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
        }
-
+       
        return 0;
 }
 
@@ -174,9 +179,10 @@ sub search_feed {
                my $substr;
                my $pkgmatch = 1;
 
+               next if $pkg->{vdepends};
                foreach my $substr (@substr) {
                        my $match;
-                       foreach my $key (qw(name title description)) {
+                       foreach my $key (qw(name title description src)) {
                                $pkg->{$key} and $substr and $pkg->{$key} =~ m/$substr/i and $match = 1;
                        }
                        $match or undef $pkgmatch;
@@ -207,6 +213,7 @@ sub list_feed {
        get_feed($feed);
        foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
                my $pkg = $package{$name};
+               next if $pkg->{vdepends};
                if($pkg->{name}) {
                        printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
                }
@@ -259,6 +266,8 @@ my %install_method = (
        'src-cpy' => \&install_generic,
        'src-link' => \&install_generic,
        'src-git' => \&install_generic,
+       'src-bzr' => \&install_generic,
+       'src-hg' => \&install_generic,
 );
 
 my %feed;
@@ -320,10 +329,11 @@ sub install_package {
 
        # install all dependencies
        foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
-               foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+               foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;
                        $dep =~ s/^.+://;
+                       $dep =~ s/\/.+$//;
                        next unless $dep;
                        install_package($feed, $dep) == 0 or $ret = 1;
                }
@@ -339,7 +349,7 @@ sub refresh_config {
        system("rm -f tmp/.packageinfo");
 
        # refresh the config
-       if ($default) { 
+       if ($default) {
                system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
        } else {
                system("$mk defconfig Config.in >/dev/null 2>/dev/null");
@@ -376,6 +386,7 @@ sub install {
                                get_feed($f->[1]);
                                foreach my $name (sort { lc($a) cmp lc($b) } keys %package) {
                                        my $p = $package{$name};
+                                       next if $p->{vdepends};
                                        if( $p->{name} ) {
                                                install_package($feed, $p->{name}) == 0 or $ret = 1;
                                        }
@@ -435,13 +446,6 @@ sub uninstall {
        return 0;
 }
 
-my %update_method = (
-       'src-svn' => \&update_svn,
-       'src-cpy' => \&update_cpy,
-       'src-link' => \&update_link,
-       'src-git' => \&update_git
-);
-
 sub update_feed($$$$)
 {
        my $type=shift;
@@ -461,7 +465,7 @@ sub update_feed($$$$)
                my $failed = 1;
                foreach my $feedsrc (@$src) {
                        warn "Updating feed '$name' from '$feedsrc' ...\n";
-                       next unless &{$update_method{$type}}($name, $feedsrc, $force_relocate) == 0;
+                       next unless update_feed_via($type, $name, $feedsrc, $force_relocate) == 0;
                        $failed = 0;
                        last;
                }