projects
/
openwrt
/
staging
/
chunkeey.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d7fee0b
)
don't overwrite version.mk, substitute REVISION instead
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 17 Apr 2012 09:31:16 +0000
(09:31 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 17 Apr 2012 09:31:16 +0000
(09:31 +0000)
SVN-Revision: 31327
target/imagebuilder/Makefile
patch
|
blob
|
history
diff --git
a/target/imagebuilder/Makefile
b/target/imagebuilder/Makefile
index 3d04656250857b0bd4d96adcdabbbce1f0faa780..686a175065697f97787292723f2f1c48f70ce8a6 100644
(file)
--- a/
target/imagebuilder/Makefile
+++ b/
target/imagebuilder/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-201
0
OpenWrt.org
+# Copyright (C) 2006-201
2
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# 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)/
$(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 > $@
find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
| $(XARGS) rm -rf
$(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@