From 9fef48ad3100f26c9cd38f119feccbf132f02e37 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 26 Oct 2010 13:35:04 +0000 Subject: [PATCH] [backfire] merge r23639 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23640 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/imagebuilder/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 1e3519fba..30083999e 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