X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4d0450885f8b1836e18eecc1b2e7962838c8c1b7..19c9f8b84c0b8abaa703ca5ae9211ec0cfe9e9c7:/target/linux/x86/image/Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 9bd2eada6..2bdfba5d0 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -49,9 +49,9 @@ ifneq ($(HOST_OS),Darwin)
   define Image/Prepare/grub
 	# for the image builder
 	$(CP) \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage1 \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2 \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/stage1 \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/stage2 \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/e2fs_stage1_5 \
 		$(KDIR)/
   endef
 else
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_X86_VDI_IMAGES),y)
     # left here because the image builder doesnt need these
     ifeq ($(1),ext2)
 		rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi || true
-		vditool DD $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi $(BIN_DIR)/openwrt-$(BOARD)-ext2.image
+		VBoxManage convertfromraw -format VDI $(BIN_DIR)/openwrt-$(BOARD)-ext2.image $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi
     endif
   endef
 endif
@@ -93,7 +93,7 @@ endef
 
 define Image/Build/iso 
 	$(CP) \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2_eltorito \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \
 		$(KDIR)/root.grub/boot/grub/stage2_eltorito 
 	sed -i \
 		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
@@ -121,8 +121,8 @@ endef
 $(eval $(call BuildImage))
 
 ifeq ($(CONFIG_X86_VDI_IMAGES),y)
-  $(eval $(call RequireCommand,vditool, \
-	You need vditool to generate VirtualBox images. \
+  $(eval $(call RequireCommand,VBoxManage, \
+	You need VBoxManage to generate VirtualBox images. \
   ))
 endif