From: Felix Fietkau Date: Thu, 26 Jul 2007 15:28:59 +0000 (+0000) Subject: add source feed rev to menuconfig, set 8180 as default rev for kamikaze 7.07 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=d31a879f220e3330d625518a4abd628e5d70e5f4 add source feed rev to menuconfig, set 8180 as default rev for kamikaze 7.07 SVN-Revision: 8181 --- diff --git a/Config.in b/Config.in index 705c24ad2f..536a4141ba 100644 --- a/Config.in +++ b/Config.in @@ -123,6 +123,12 @@ config SOURCE_FEEDS help Separate sources with spaces : " " +config SOURCE_FEEDS_REV + string + prompt "Revision for the source feed svn checkout" if BUILDOPTS + default "8180" + + source "toolchain/Config.in" source "target/imagebuilder/Config.in" source "target/sdk/Config.in" diff --git a/package/Makefile b/package/Makefile index 59ee670a76..501b158e4f 100644 --- a/package/Makefile +++ b/package/Makefile @@ -77,7 +77,7 @@ $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) symlinks: - ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) + ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) $(CONFIG_SOURCE_FEEDS_REV) ifeq ($(MAKECMDGOALS),compile) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) diff --git a/scripts/feeds.sh b/scripts/feeds.sh index a6d4ef9d71..0c7dc85670 100755 --- a/scripts/feeds.sh +++ b/scripts/feeds.sh @@ -37,11 +37,11 @@ setup_symlinks() { 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"