From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 13 Apr 2012 10:49:23 +0000 (+0000)
Subject: [backfire] merge r31271
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=f79d9b945fe3013e3264204c4830902ee6439bea

[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 af25be02f..4687dcc2e 100644
--- 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 737404108..99177984e 100644
--- 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