From 1dafa7c88955e259808ccec6f7c3870dddd16040 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 13 Apr 2012 10:49:23 +0000 Subject: [PATCH] merge r31271 SVN-Revision: 31272 --- include/version.mk | 3 +++ target/sdk/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 -- 2.30.2