[backfire] uhttpd: merge r28792

[openwrt-10.03/.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 43c5c6dc43d2e691c0ee283b6651808d58a46ea4..ba060b8089945b43be795ce7cbd9aa58dce1441b 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -114,8 +114,13 @@ my %update_method = (
                'update'        => ""},
        'src-git' => {
                'init'          => "git clone --depth 1 '%s' '%s'",
+               'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
                'update'        => "git pull",
                'controldir'    => ".git"},
+       'src-gitsvn' => {
+                'init'          => "git svn clone -r HEAD '%s' '%s'",
+                'update'        => "git svn rebase",
+                'controldir'    => ".git"},
        'src-bzr' => {
                'init'          => "bzr checkout --lightweight '%s' '%s'",
                'update'        => "bzr update",
@@ -139,10 +144,15 @@ sub update_feed_via($$$$) {
        my $localpath = "./feeds/$name";
        my $safepath = $localpath;
        $safepath =~ s/'/'\\''/;
+       my ($base, $branch) = split(/;/, $src, 2);
 
        if( $relocate || !$m->{'update'} || !-d "$localpath/$m->{'controldir'}" ) {
                system("rm -rf '$safepath'");
-               system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+               if ($m->{'init_branch'} and $branch) {
+                       system(sprintf($m->{'init_branch'}, $branch, $base, $safepath)) == 0 or return 1;
+               } else {
+                       system(sprintf($m->{'init'}, $src, $safepath)) == 0 or return 1;
+               }
        } else {
                system("cd '$safepath'; $m->{'update'}") == 0 or return 1;
        }
@@ -276,6 +286,7 @@ my %install_method = (
        'src-cpy' => \&install_generic,
        'src-link' => \&install_generic,
        'src-git' => \&install_generic,
+       'src-gitsvn' => \&install_generic,
        'src-bzr' => \&install_generic,
        'src-hg' => \&install_generic,
 );