X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/074c4146b6cdac24db56c52b314753f9f7e52217..e5e2267ec8aeb9167a9f2cbf09ab7d6757a4c447:/scripts/feeds

diff --git a/scripts/feeds b/scripts/feeds
index afb8fff29..3932a2d6d 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -11,6 +11,18 @@ use Cwd 'abs_path';
 chdir "$FindBin::Bin/..";
 $ENV{TOPDIR}=getcwd();
 
+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;
@@ -19,86 +31,118 @@ sub parse_config() {
 	my $line = 0;
 	my %name;
 
-	open FEEDS, "feeds.conf";
+	open FEEDS, "feeds.conf" or
+		open FEEDS, "feeds.conf.default" or
+		die "Unable to open feeds configuration";
 	while (<FEEDS>) {
 		chomp;
 		s/#.+$//;
 		next unless /\S/;
 		my @line = split /\s+/, $_, 3;
+		my @src;
 		$line++;
 
 		my $valid = 1;
 		$line[0] =~ /^src-\w+$/ or $valid = 0;
 		$line[1] =~ /^\w+$/ or $valid = 0;
-		$line[2] =~ /\s/ and $valid = 0;
-		$valid or die "Syntax error in feeds.list, line: $line\n";
+		@src = split /\s+/, $line[2];
+		$valid or die "Syntax error in feeds.conf, line: $line\n";
 
 		$name{$line[1]} and die "Duplicate feed name '$line[1]', line: $line\n";
 		$name{$line[1]} = 1;
 
-		push @feeds, [@line];
+		push @feeds, [$line[0], $line[1], \@src];
 	}
 	close FEEDS;
 }
 
-sub update_index($)
+sub update_location($$)
 {
 	my $name = shift;
+	my $url  = shift;
+	my $old_url;
 
 	-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
-	-d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
-
-	system("make -s prepare-mk TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
-	system("make -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=4 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
-	system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
 
-	return 0;
-}
-
-sub update_svn($$) {
-	my $name = shift;
-	my $src = shift;
+	if( open LOC, "< ./feeds/$name.tmp/location" )
+	{
+		chomp($old_url = readline LOC);
+		close LOC;
+	}
 
-	if (-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;
+	if( !$old_url || $old_url ne $url )
+	{
+		if( open LOC, "> ./feeds/$name.tmp/location" )
+		{
+			print LOC $url, "\n";
+			close LOC;
+		}
+		return $old_url ? 1 : 0;
 	}
 
 	return 0;
 }
 
-sub update_cpy($$) {
+sub update_index($)
+{
 	my $name = shift;
-	my $src = shift;
 
-	system("mkdir -p ./feeds/$name");
-	system("cp -Rf $src ./feeds");
+	-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
+	-d "./feeds/$name.tmp/info" or mkdir "./feeds/$name.tmp/info" or return 1;
+
+	system("$mk -s prepare-mk TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+	system("$mk -s -f include/scan.mk IS_TTY=1 SCAN_TARGET=\"packageinfo\" SCAN_DIR=\"feeds/$name\" SCAN_NAME=\"package\" SCAN_DEPS=\"$ENV{TOPDIR}/include/package*.mk\" SCAN_DEPTH=5 SCAN_EXTRA=\"\" TMP_DIR=\"$ENV{TOPDIR}/feeds/$name.tmp\"");
+	system("ln -sf $name.tmp/.packageinfo ./feeds/$name.index");
 
 	return 0;
 }
 
-sub update_link($$) {
-	my $name = shift;
-	my $src = abs_path(shift);
-
-	system("rm -f ./feeds/$name; ln -s $src ./feeds/$name");
+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_git($$) {
+sub update_feed_via($$$$) {
+	my $type = shift;
 	my $name = shift;
 	my $src = shift;
-
-	if (-d "./feeds/$name/.git" ) {
-		system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
+	my $relocate = shift;
+	
+	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;
 }
 
@@ -117,7 +161,7 @@ sub get_feed($) {
 }
 
 sub get_installed() {
-	system("make -s prepare-tmpinfo");
+	system("$mk -s prepare-tmpinfo");
 	clear_packages();
 	parse_package_metadata("./tmp/.packageinfo");
 	%installed = %package;
@@ -135,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;
@@ -168,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};
 		}
@@ -186,7 +232,7 @@ sub list {
 	}
 	if ($opts{s}) {
 		foreach my $feed (@feeds) {
-			printf "\%-32s\tURL: %s\n", $feed->[1], $feed->[2];
+			printf "\%-32s\tURL: %s\n", $feed->[1], join(", ", @{$feed->[2]});
 		}
 		return 0;
 	}
@@ -220,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;
@@ -245,7 +293,7 @@ sub install_package {
 	$feed or do {
 		$installed{$name} and return 0;
 		# TODO: check if it's already installed within ./package directory
-		warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
+		$srcpackage{$name} or -d "./package/$name" or warn "WARNING: No feed for package '$name' found, maybe it's already part of the standard packages?\n";
 		return 0;
 	};
 
@@ -264,13 +312,6 @@ sub install_package {
 	# newly installed packages set the source package
 	$installed{$src} and return 0;
 
-	# install all dependencies
-	foreach my $dep (@{$pkg->{depends}}) {
-		next if $dep =~ /@/;
-		$dep =~ s/^\+//;
-		install_package($feed, $dep) == 0 or $ret = 1;
-	}
-
 	# check previously installed packages
 	$installed{$name} and return 0;
 	$installed{$src} = 1;
@@ -286,6 +327,18 @@ sub install_package {
 		return 1;
 	};
 
+	# install all dependencies
+	foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
+		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;
+		}
+	}
+
 	return $ret;
 }
 
@@ -296,10 +349,10 @@ sub refresh_config {
 	system("rm -f tmp/.packageinfo");
 
 	# refresh the config
-	if ($default) { 
-		system("make oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
+	if ($default) {
+		system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
 	} else {
-		system("make defconfig Config.in >/dev/null 2>/dev/null");
+		system("$mk defconfig Config.in >/dev/null 2>/dev/null");
 	}
 }
 
@@ -333,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;
 					}
@@ -392,27 +446,30 @@ 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;
 	my $name=shift;
 	my $src=shift;
 	my $perform_update=shift;
+	my $force_relocate=update_location( $name, "@$src" );
 
+	if( $force_relocate ) {
+		warn "Source of feed $name has changed, replacing copy\n";
+	}
 	$update_method{$type} or do {
 		warn "Unknown type '$type' in feed $name\n";
 		return 1;
 	};
 	$perform_update and do {
-		warn "Updating feed '$name' from '$src' ...\n";
-		&{$update_method{$type}}($name, $src) == 0 or do {
+		my $failed = 1;
+		foreach my $feedsrc (@$src) {
+			warn "Updating feed '$name' from '$feedsrc' ...\n";
+			next unless update_feed_via($type, $name, $feedsrc, $force_relocate) == 0;
+			$failed = 0;
+			last;
+		}
+		$failed and do {
 			warn "failed.\n";
 			return 1;
 		};