X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Ffeeds;h=b1bdee597ea0f2e1a8c5da5553bd9064737cb949;hp=a9b2eb980a517c9d052d6474324b3f42ffc68d7d;hb=a1bcd25082fd6780d6eb9184acb1813bf723841f;hpb=e925dbf704f261fb67deaa8a4849d810e44c46c1

diff --git a/scripts/feeds b/scripts/feeds
index a9b2eb980a..b1bdee597e 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -10,8 +10,9 @@ use Cwd 'abs_path';
 
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
+$ENV{GIT_CONFIG_PARAMETERS}="'core.autocrlf=false'";
 
-my $mk=`which gmake`;	# select the right 'make' program
+my $mk=`which gmake 2>/dev/null`;	# select the right 'make' program
 chomp($mk);		# trim trailing newline
 $mk or $mk = "make";	# default to 'make'
 
@@ -105,22 +106,27 @@ my %update_method = (
 	'src-svn' => {
 		'init'		=> "svn checkout '%s' '%s'",
 		'update'	=> "svn update",
-		'controldir'	=> ".svn"},
+		'controldir'	=> ".svn",
+		'revision'	=> "svn info | grep 'Revision' | cut -d ' ' -f 2 | tr -d '\n'"},
 	'src-cpy' => {
 		'init'		=> "cp -Rf '%s' '%s'",
-		'update'	=> ""},
+		'update'	=> "",
+		'revision'	=> "echo -n 'local'"},
 	'src-link' => {
 		'init'		=> "ln -s '%s' '%s'",
-		'update'	=> ""},
+		'update'	=> "",
+		'revision'	=> "echo -n 'local'"},
 	'src-git' => {
-		'init'		=> "git clone --depth 1 '%s' '%s'",
-		'init_branch'	=> "git clone --depth 1 --branch '%s' '%s' '%s'",
+		'init'          => "git clone --depth 1 '%s' '%s'",
+		'init_branch'   => "git clone --depth 1 --branch '%s' '%s' '%s'",
 		'update'	=> "git pull",
-		'controldir'	=> ".git"},
+		'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",
-                'controldir'    => ".git"},
+		'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'"},
 	'src-bzr' => {
 		'init'		=> "bzr checkout --lightweight '%s' '%s'",
 		'update'	=> "bzr update",
@@ -249,14 +255,31 @@ sub list_feed {
 sub list {
 	my %opts;
 
-	getopts('r:sh', \%opts);
+	getopts('r:d:sh', \%opts);
 	if ($opts{h}) {
 		usage();
 		return 0;
 	}
 	if ($opts{s}) {
 		foreach my $feed (@feeds) {
-			printf "\%-32s\tURL: %s\n", $feed->[1], join(", ", @{$feed->[2]});
+			my $localpath = "./feeds/$feed->[1]";
+			my $m = $update_method{$feed->[0]};
+			my $revision;
+			if( !$m->{'revision'} ) {
+				$revision = "X";
+			}
+			elsif( $m->{'controldir'} && -d "$localpath/$m->{'controldir'}" ) {
+				$revision = `cd '$localpath'; $m->{'revision'}`;
+			}
+			else {
+				$revision = "local";
+			}
+			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]});
+			}
+			else {
+				printf "\%-8s \%-8s \%-8s \%s\n", $feed->[1], $feed->[0], $revision, join(", ", @{$feed->[2]});
+			}
 		}
 		return 0;
 	}
@@ -518,7 +541,7 @@ sub update {
 	my $perform_update=1;
 
 	$ENV{SCAN_COOKIE} = $$;
-	$ENV{KBUILD_VERBOSE} = 99;
+	$ENV{OPENWRT_VERBOSE} = 's';
 
 	getopts('ahi', \%opts);
 
@@ -564,10 +587,11 @@ sub usage() {
 Usage: $0 <command> [options]
 
 Commands:
-	list [options]: List feeds and their content
+	list [options]: List feeds, their content and revisions (if installed)
 	Options:
-	    -s :           List of feed names and their URL.
-	    -r <feedname>: List packages of specified feed.
+	    -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)
 
 	install [options] <package>: Install a package
 	Options: