diff options
| author | John Crispin <john@openwrt.org> | 2014-07-10 22:02:31 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-07-10 22:02:31 +0000 |
| commit | 68e86140090a52b56920b59646516c347b710c74 (patch) | |
| tree | ef056e8a6e67e4a5c7bd4910e282e557fe10f1dd /target | |
| parent | 03faf4618e65079268a7372a13669d5e10869c88 (diff) | |
| download | upstream-68e86140090a52b56920b59646516c347b710c74.tar.gz upstream-68e86140090a52b56920b59646516c347b710c74.tar.bz2 upstream-68e86140090a52b56920b59646516c347b710c74.zip | |
imagebuilder: x86 fails to build inside the imagebuilder
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41580
Diffstat (limited to 'target')
| -rw-r--r-- | target/imagebuilder/Makefile | 5 |
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{,-*} |