From 896bf5977611a3293d66cf92d70d4c833ae5b8a8 Mon Sep 17 00:00:00 2001 From: blogic Date: Thu, 10 Jul 2014 22:02:31 +0000 Subject: [PATCH] imagebuilder: x86 fails to build inside the imagebuilder Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41580 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/imagebuilder/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index e52ca623ee..b728ef54be 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -24,7 +24,7 @@ all: compile $(BIN_DIR)/$(IB_NAME).tar.bz2: clean rm -rf $(PKG_BUILD_DIR) - mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/host \ + mkdir -p $(IB_KDIR) $(IB_LDIR) $(PKG_BUILD_DIR)/staging_dir/{host,lib} \ $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config $(CP) \ @@ -38,6 +38,9 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean $(VERSION_SED) $(PKG_BUILD_DIR)/repositories.conf $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/ + if [ -d $(TOPDIR)/staging_dir/host/lib/grub ]; then \ + $(CP) $(TOPDIR)/staging_dir/host/lib/grub/ $(PKG_BUILD_DIR)/staging_dir/lib; \ + fi rm -rf \ $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \ $(PKG_BUILD_DIR)/target/linux/*/patches{,-*} -- 2.11.0