From: John Crispin <john@openwrt.org>
Date: Thu, 10 Jul 2014 22:02:31 +0000 (+0000)
Subject: imagebuilder: x86 fails to build inside the imagebuilder
X-Git-Tag: v19.07.0-rc1~17237
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=68e86140090a52b56920b59646516c347b710c74;p=openwrt%2Fstaging%2Fhauke.git

imagebuilder: x86 fails to build inside the imagebuilder

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 41580
---

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{,-*}