build system cleanup/restructuring as described in http://lists.openwrt.org/pipermail...

[openwrt.git] / scripts / feeds.sh

diff --git a/scripts/feeds.sh b/scripts/feeds.sh
index 9fc3343..d442420 100755 (executable)
--- a/scripts/feeds.sh
+++ b/scripts/feeds.sh
@@ -22,7 +22,7 @@ cd $TOPDIR
 
 # Some functions we might call several times a run
 delete_symlinks() {
 
 # Some functions we might call several times a run
 delete_symlinks() {

-       find $1 -type l -exec rm -f {} +
+       find $1 -type l | xargs -r rm -f

 }
 
 setup_symlinks() {
 }
 
 setup_symlinks() {


@@ -30,18 +30,18 @@ setup_symlinks() {
        # so that we can make this structure be flat in $PACKAGE_DIR
        for dir in $(ls $1/)
        do
        # 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
        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
                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
 }
                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")
 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"
 done
 # Finally setup symlinks
 setup_symlinks "$FEEDS_DIR" "$PACKAGE_DIR"