mirror of https://github.com/hak5/openwrt-owl.git
add source feed rev to menuconfig, set 8180 as default rev for kamikaze 7.07
SVN-Revision: 8181owl
parent
109f15b54c
commit
0fc8be8ade
|
@ -129,6 +129,12 @@ config BUILD_SUFFIX
|
|||
help
|
||||
Build suffix to append to the BUILD_DIR variable, i.e: build_dir_suffix
|
||||
|
||||
config SOURCE_FEEDS_REV
|
||||
string
|
||||
prompt "Revision for the source feed svn checkout" if BUILDOPTS
|
||||
default ""
|
||||
|
||||
|
||||
source "toolchain/Config.in"
|
||||
source "target/imagebuilder/Config.in"
|
||||
source "target/sdk/Config.in"
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue