aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-26 13:34:21 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-26 13:34:21 +0000
commitf40416daf3fe52dc86ce292543c4c47c561d9192 (patch)
tree6ee03df60f173c344273a0aaf3aea1010064ff4f /target
parenta23760cc4bc6daabfa56cb4cab2844dcdf238614 (diff)
downloadmaster-187ad058-f40416daf3fe52dc86ce292543c4c47c561d9192.tar.gz
master-187ad058-f40416daf3fe52dc86ce292543c4c47c561d9192.tar.bz2
master-187ad058-f40416daf3fe52dc86ce292543c4c47c561d9192.zip
[imagebuilder] copy kernel .config, needed by mkfs.jffs2 to detect compression capabilities
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23639 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/imagebuilder/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 1e3519fba1..30083999e4 100644
--- 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_LDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(LINUX_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) \
@@ -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
+ -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