From: Jo-Philipp Wich Date: Tue, 17 Apr 2012 09:37:34 +0000 (+0000) Subject: [backfire] merge r31327 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=02fa75d9b4780ce7e130961f2f0c1271dac052f9;p=openwrt%2Fsvn-archive%2Farchive.git [backfire] merge r31327 SVN-Revision: 31328 --- 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 > $@