X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ff9add18776b9c1fb1dd645242c62c1aa757ef07..8db1ac1beb8f851c08a105eaca5a768fab9efc10:/target/linux/x86/image/Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 2c4cc350e..b5297bbff 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -32,7 +32,6 @@ endif
 ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
 
 ifneq ($(CONFIG_X86_GRUB_IMAGES),)
- ifneq ($(HOST_OS),Darwin)
 
   BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
 
@@ -83,16 +82,6 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
 		$(KDIR)/
   endef
 
- else
-
-  define Image/Build/grub
-	PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh \
-		$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
-		$(CONFIG_TARGET_KERNEL_PARTSIZE) "" \
-		$(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1)
-  endef
-
- endif
 endif
 
 ROOTDELAY=10
@@ -154,7 +143,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
     # left here because the image builder doesnt need these
     ifeq ($(1),ext2)
 		rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
-		VBoxManage convertfromraw -format VDI \
+		qemu-img convert -f raw -O vdi \
 			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
 			$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
 		# XXX: VBoxManage insists on setting perms to 0600
@@ -202,15 +191,3 @@ define Image/Build
 endef
 
 $(eval $(call BuildImage))
-
-ifneq ($(CONFIG_X86_VDI_IMAGES),)
-  $(eval $(call RequireCommand,VBoxManage, \
-	You need VBoxManage to generate VirtualBox images. \
-  ))
-endif
-
-ifneq ($(CONFIG_X86_VMDK_IMAGES),)
-  $(eval $(call RequireCommand,qemu-img, \
-	You need qemu-img to generate VMware images. \
-  ))
-endif