[sdk] don't overwrite version.mk, substitute REVISION instead
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 13 Apr 2012 10:47:45 +0000 (10:47 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 13 Apr 2012 10:47:45 +0000 (10:47 +0000)
SVN-Revision: 31271

include/version.mk
target/sdk/Makefile

index af25be0..4687dcc 100644 (file)
@@ -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 \
index 7374041..9917798 100644 (file)
@@ -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