aboutsummaryrefslogtreecommitdiffstats
path: root/target/imagebuilder
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-07-10 22:02:31 +0000
committerJohn Crispin <blogic@openwrt.org>2014-07-10 22:02:31 +0000
commit8596ba6e34c1027aebf737f4e215ae56b03dbe8a (patch)
treea8b001db9fb0983401e573f7e4dae5ab5e32fb8b /target/imagebuilder
parentcba7db1e96c00ce087b960c7a869813e14d50bcd (diff)
downloadmaster-187ad058-8596ba6e34c1027aebf737f4e215ae56b03dbe8a.tar.gz
master-187ad058-8596ba6e34c1027aebf737f4e215ae56b03dbe8a.tar.bz2
master-187ad058-8596ba6e34c1027aebf737f4e215ae56b03dbe8a.zip
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
Diffstat (limited to 'target/imagebuilder')
-rw-r--r--target/imagebuilder/Makefile5
1 files changed, 4 insertions, 1 deletions
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{,-*}