kernel: Fix the incorrect i_nlink count after jffs2's RENAME_EXCHANGE operations.

[openwrt/staging/dedeckeh.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 2b88eb8193367c18567a0ffd969e6bccff59b478..dfecaa9bb65222d116d4be71c2d32ffe55011ed2 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -9,7 +9,8 @@ use strict;
 use Cwd 'abs_path';
 
 chdir "$FindBin::Bin/..";
-$ENV{TOPDIR}=getcwd();
+$ENV{TOPDIR} //= getcwd();
+chdir $ENV{TOPDIR};
 $ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
 $ENV{GREP_OPTIONS}="";
 
@@ -22,7 +23,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;
-$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;
@@ -127,19 +131,19 @@ my %update_method = (
                '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'"},
+               'revision'      => "git rev-parse --short HEAD | 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'"},
+               'revision'      => "git rev-parse --short HEAD | tr -d '\n'"},
        'src-gitsvn' => {
                'init'  => "git svn clone -r HEAD '%s' '%s'",
                'update'        => "git svn rebase",
                'controldir'    => ".git",
-               'revision'      => "git show --abbrev-commit HEAD | head -n 1 | cut -d ' ' -f 2 | tr -d '\n'"},
+               'revision'      => "git rev-parse --short HEAD | tr -d '\n'"},
        'src-bzr' => {
                'init'          => "bzr checkout --lightweight '%s' '%s'",
                'update'        => "bzr update",
@@ -330,7 +334,7 @@ sub list {
                        my $localpath = "./feeds/$feed->[1]";
                        my $m = $update_method{$feed->[0]};
                        my $revision;
-                       if( !$m->{'revision'} ) {
+                       if (!-d "$localpath" || !$m->{'revision'}) {
                                $revision = "X";
                        }
                        elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
@@ -351,7 +355,7 @@ sub list {
                                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]});
+                               printf "\%-10s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
                        }
                }
                return 0;
@@ -531,6 +535,11 @@ sub install_package {
 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");