brcm2708-gpu-fw: update to latest version

[openwrt/openwrt.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 6e30b5a20f03da902a9fa54bebec6ce5e55e96f9..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;


@@ -22,7 +22,10 @@ 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;
 $valid_mk or die "Unsupported version of make found: $mk\n";
 
 my @feeds;


@@ -51,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";


@@ -128,6 +131,13 @@ my %update_method = (
                'update'        => "git pull --ff",
                'controldir'    => ".git",
                'revision'      => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
                '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' => {
                'init'  => "git svn clone -r HEAD '%s' '%s'",
                'update'        => "git svn rebase",
        'src-gitsvn' => {
                'init'  => "git svn clone -r HEAD '%s' '%s'",
                'update'        => "git svn rebase",


@@ -307,7 +317,7 @@ sub list_feed {
 sub list {
        my %opts;
 
 sub list {
        my %opts;
 

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

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


@@ -335,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]});
                        }


@@ -366,7 +384,29 @@ sub do_install_package($$) {
        return 0;
 }
 
        return 0;
 }
 

-my %feed;
+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;
+       }
+
+       return 0;
+}

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


@@ -374,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;
 }


@@ -389,12 +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;
        my $force = shift;
        my $ret = 0;
 
 sub install_package {
        my $feed = shift;
        my $name = shift;
        my $force = shift;
        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;


@@ -404,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


@@ -435,8 +508,8 @@ sub install_package {
        $installed{$src} = 1;
 
        defined($override) and $override == 1
        $installed{$src} = 1;
 
        defined($override) and $override == 1

-               and warn "Overriding package '$src'\n"
-               or warn "Installing package '$src'\n";
+               and warn "Overriding core package '$src' with version from $feed->[1]\n"
+               or warn "Installing package '$src' from $feed->[1]\n";

 
        do_install_package($feed, $pkg) == 0 or do {
                warn "failed.\n";
 
        do_install_package($feed, $pkg) == 0 or do {
                warn "failed.\n";


@@ -461,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");
 


@@ -488,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;


@@ -526,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;


@@ -540,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) {


@@ -548,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";


@@ -603,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';


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

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

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


@@ -637,14 +737,14 @@ 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 0;
+       return $failed;

 }
 
 sub feed_config() {
 }
 
 sub feed_config() {


@@ -674,6 +774,7 @@ Commands:
            -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:
 
        install [options] <package>: Install a package
        Options:


@@ -709,7 +810,7 @@ my %commands = (
        'uninstall' => \&uninstall,
        'feed_config' => \&feed_config,
        'clean' => sub {
        'uninstall' => \&uninstall,
        'feed_config' => \&feed_config,
        'clean' => sub {

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

        }
 );
 
        }
 );