imagebuilder: x86 fails to build inside the imagebuilder

Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41580 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index e52ca62..b728ef5 100644 (file)
--- 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{,-*}