summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-04-13 10:47:45 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-04-13 10:47:45 +0000
commit93b8648b153836157f63850adea87b32f4b5cea8 (patch)
treeeba816bd000e0f98c8659f77fc106cc2d788f8a7
parent4b230e19fc765c582555647945d4380c37cecc49 (diff)
downloadmtk-20170518-93b8648b153836157f63850adea87b32f4b5cea8.zip
mtk-20170518-93b8648b153836157f63850adea87b32f4b5cea8.tar.gz
mtk-20170518-93b8648b153836157f63850adea87b32f4b5cea8.tar.bz2
don't overwrite version.mk, substitute REVISION instead
SVN-Revision: 31271
-rw-r--r--include/version.mk3
-rw-r--r--target/sdk/Makefile2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/version.mk b/include/version.mk
index af25be0..4687dcc 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 7374041..9917798 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