From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 13 Apr 2012 10:47:45 +0000 (+0000)
Subject: don't overwrite version.mk, substitute REVISION instead
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93b8648b153836157f63850adea87b32f4b5cea8;p=openwrt%2Fstaging%2Fmans0n.git

don't overwrite version.mk, substitute REVISION instead

SVN-Revision: 31271
---

diff --git a/include/version.mk b/include/version.mk
index af25be02f7..4687dcc2e0 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 737404108d..99177984e2 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