projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c173d41
)
copy kernel .config, needed by mkfs.jffs2 to detect compression capabilities
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 26 Oct 2010 13:34:21 +0000
(13:34 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 26 Oct 2010 13:34:21 +0000
(13:34 +0000)
SVN-Revision: 23639
target/imagebuilder/Makefile
patch
|
blob
|
history
diff --git
a/target/imagebuilder/Makefile
b/target/imagebuilder/Makefile
index 1e3519fba1b86c4ff889e6610ff86e9bc3306d95..30083999e4e73f570f57005b12616bdf9f65ad1a 100644
(file)
--- a/
target/imagebuilder/Makefile
+++ b/
target/imagebuilder/Makefile
@@
-17,12
+17,13
@@
PKG_CPU:=$(shell uname -m | sed "s/ //g")
IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
+IB_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_DIR))
all: compile
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(PKG_BUILD_DIR)
all: compile
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
rm -rf $(PKG_BUILD_DIR)
- mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host \
+ mkdir -p $(IB_KDIR) $(
IB_LDIR) $(
PKG_BUILD_DIR)/staging_dir/host \
$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
$(CP) \
$(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts
-cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
$(CP) \
@@
-41,6
+42,7
@@
$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
$(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
$(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
$(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
find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
| $(XARGS) rm -rf
echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
| $(XARGS) rm -rf