X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fflorian.git;a=blobdiff_plain;f=scripts%2Ffeeds.sh;h=d44242069d83849b4a8be8a08425cc780638e3fc;hp=a6d4ef9d71a713513e12fe66800e438366c0da28;hb=0fc8be8adec0e737de62e453dd92281faf6b195a;hpb=3e91dd1bd509f3691a65b79d8ef2d02630aae479

diff --git a/scripts/feeds.sh b/scripts/feeds.sh
index a6d4ef9d71..d44242069d 100755
--- a/scripts/feeds.sh
+++ b/scripts/feeds.sh
@@ -30,18 +30,18 @@ setup_symlinks() {
 	# so that we can make this structure be flat in $PACKAGE_DIR
 	for dir in $(ls $1/)
 	do
-		ln -s $1/$dir/*/* $2/
+		ln -s $1/$dir/* $2/
 	done
 }
 
 checkout_feed() {
 	# We ensure the feed has not already been checked out, if so, we just update the source feed
 	if [ -d $FEEDS_DIR/$2 ]; then
-		svn up $FEEDS_DIR/$2
+		svn up ${3:+-r$3} $FEEDS_DIR/$2
 		echo "Updated to revision $(LANG=C svn info $FEEDS_DIR/$2 | awk '/^Revision:/ { print $2 }' )";
 	# Otherwise, we have to checkout in the $FEEDS_DIR 
 	else
-		svn co $1 $FEEDS_DIR/$2
+		svn co ${3:+-r$3} $1 $FEEDS_DIR/$2
 		echo "Checked out revision $(LANG=C svn info $FEEDS_DIR/$2 | awk '/^Revision:/ { print $2 }' )";
 	fi
 }
@@ -57,7 +57,7 @@ delete_symlinks "$PACKAGE_DIR"
 for feed in $1
 do
 	name=$(extract_feed_name "$feed")
-	checkout_feed "$feed" "$name"
+	checkout_feed "$feed" "$name" "$2"
 done
 # Finally setup symlinks
 setup_symlinks "$FEEDS_DIR" "$PACKAGE_DIR"