aboutsummaryrefslogtreecommitdiffstats
path: root/target/imagebuilder
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-04-17 09:31:16 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-04-17 09:31:16 +0000
commitcfe30549a16b84e0d7caebd94fd7c2b81261de1a (patch)
tree45c86df5c2fff69adc0657dfe2091ccc5dba48d6 /target/imagebuilder
parentd7fee0b596793b5f3ac9059e115b625a7f2ff7d0 (diff)
downloadupstream-cfe30549a16b84e0d7caebd94fd7c2b81261de1a.tar.gz
upstream-cfe30549a16b84e0d7caebd94fd7c2b81261de1a.tar.bz2
upstream-cfe30549a16b84e0d7caebd94fd7c2b81261de1a.zip
don't overwrite version.mk, substitute REVISION instead
SVN-Revision: 31327
Diffstat (limited to 'target/imagebuilder')
-rw-r--r--target/imagebuilder/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 3d04656250..686a175065 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -44,7 +44,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
-cp $(LINUX_DIR)/.config $(IB_LDIR)/
- echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
+ $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(PKG_BUILD_DIR)/include/version.mk
find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
| $(XARGS) rm -rf
$(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@