[backfire] merge r31271

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@31272 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/version.mk b/include/version.mk
index af25be0..4687dcc 100644 (file)
--- a/include/version.mk
+++ b/include/version.mk
@@ -5,6 +5,9 @@
 # See /LICENSE for more information.
 #
 
+# Substituted by SDK, do not remove
+# REVISION:=x
+
 PKG_CONFIG_DEPENDS += \
        CONFIG_VERSION_NUMBER \
        CONFIG_VERSION_NICK \

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 7374041..9917798 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -56,7 +56,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
                > $(SDK_BUILD_DIR)/feeds.conf.default
        cat $(TOPDIR)/feeds.conf.default \
                >> $(SDK_BUILD_DIR)/feeds.conf.default
-       echo REVISION:="$(REVISION)" > $(SDK_BUILD_DIR)/include/version.mk
+       $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
        find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf