diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-04-13 10:47:45 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-04-13 10:47:45 +0000 |
| commit | 903019e50d2b2fcff274447f71aa3fec91a0ea0d (patch) | |
| tree | bbcd547d2b4e6dcaf4ce59bb4ce16426a3841d77 | |
| parent | b4b7a17e19d316c3f738a944189ee72aa4f85f60 (diff) | |
| download | upstream-903019e50d2b2fcff274447f71aa3fec91a0ea0d.tar.gz upstream-903019e50d2b2fcff274447f71aa3fec91a0ea0d.tar.bz2 upstream-903019e50d2b2fcff274447f71aa3fec91a0ea0d.zip | |
[sdk] don't overwrite version.mk, substitute REVISION instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31271 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/version.mk | 3 | ||||
| -rw-r--r-- | target/sdk/Makefile | 2 |
2 files changed, 4 insertions, 1 deletions
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 |