X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=scripts%2Ffeeds;h=115fe46f32f672eae2b526161574bff33c8ba5cf;hp=76d83af9a3e8a8acc71172a1e1c4878c2ecd6f7d;hb=bf9e50ac82972062500c5885a55ac2b3dcebea3f;hpb=5a00c988a2992936335cd561f1ede63a89bb7a1b

diff --git a/scripts/feeds b/scripts/feeds
index 76d83af9a3..115fe46f32 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -48,6 +48,33 @@ sub parse_config() {
 	close FEEDS;
 }
 
+sub update_location($$)
+{
+	my $name = shift;
+	my $url  = shift;
+	my $old_url;
+
+	-d "./feeds/$name.tmp" or mkdir "./feeds/$name.tmp" or return 1;
+
+	if( open LOC, "< ./feeds/$name.tmp/location" )
+	{
+		chomp($old_url = readline LOC);
+		close LOC;
+	}
+
+	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_index($)
 {
 	my $name = shift;
@@ -56,17 +83,18 @@ sub update_index($)
 	-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=4 SCAN_EXTRA=\"\" 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_svn($$) {
+sub update_svn($$$) {
 	my $name = shift;
 	my $src = shift;
+	my $relocate = shift;
 
-	if (-d "./feeds/$name/.svn" ) {
+	if ( !$relocate && -d "./feeds/$name/.svn" ) {
 		system("(cd \"./feeds/$name\"; svn up)") == 0 or return 1;
 	} else {
 		system("rm -rf \"./feeds/$name\"");
@@ -76,30 +104,34 @@ sub update_svn($$) {
 	return 0;
 }
 
-sub update_cpy($$) {
+sub update_cpy($$$) {
 	my $name = shift;
 	my $src = shift;
+	my $relocate = shift;
 
+	$relocate && system("rm -rf \"./feeds/$name\"");
 	system("mkdir -p ./feeds/$name");
 	system("cp -Rf $src ./feeds");
 
 	return 0;
 }
 
-sub update_link($$) {
+sub update_link($$$) {
 	my $name = shift;
 	my $src = abs_path(shift);
+	my $relocate = shift;	# no-op
 
 	system("rm -f ./feeds/$name; ln -s $src ./feeds/$name");
 
 	return 0;
 }
 
-sub update_git($$) {
+sub update_git($$$) {
 	my $name = shift;
 	my $src = shift;
+	my $relocate = shift;
 
-	if (-d "./feeds/$name/.git" ) {
+	if ( !$relocate && -d "./feeds/$name/.git" ) {
 		system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
 	} else {
 		system("rm -rf \"./feeds/$name\"");
@@ -416,7 +448,11 @@ sub update_feed($$$$)
 	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;
@@ -425,7 +461,7 @@ sub update_feed($$$$)
 		my $failed = 1;
 		foreach my $feedsrc (@$src) {
 			warn "Updating feed '$name' from '$feedsrc' ...\n";
-			next unless &{$update_method{$type}}($name, $feedsrc) == 0;
+			next unless &{$update_method{$type}}($name, $feedsrc, $force_relocate) == 0;
 			$failed = 0;
 			last;
 		}