merge [15491] for 2.6.30

[openwrt.git] / target / linux / x86 / image / Config.in

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index a8a608f..ef7d0cd 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,7 +1,8 @@
 config X86_GRUB_IMAGES
     bool "Build GRUB images (Linux x86 or x86_64 host only)"
 config X86_GRUB_IMAGES
     bool "Build GRUB images (Linux x86 or x86_64 host only)"

-    depends LINUX_2_6_X86
-    depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+    depends TARGET_x86
+    depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS || TARGET_ROOTFS_ISO
+       select PACKAGE_grub

     default y
 
 config X86_GRUB_IMAGES_PAD
     default y
 
 config X86_GRUB_IMAGES_PAD


@@ -32,3 +33,18 @@ config X86_GRUB_BOOTOPTS
     default ""
     help
         If you don't know, just leave it blank.
     default ""
     help
         If you don't know, just leave it blank.

+
+
+config X86_VDI_IMAGES
+    bool "Build VirtualBox image files (VDI). Requires VBoxManage"
+    depends TARGET_x86
+    depends TARGET_ROOTFS_EXT2FS
+    depends X86_GRUB_IMAGES
+    select PACKAGE_kmod-pcnet32
+
+config X86_VMDK_IMAGES
+    bool "Build VMware image files (VMDK). Requires qemu-img"
+    depends TARGET_x86
+    depends TARGET_ROOTFS_EXT2FS
+    depends X86_GRUB_IMAGES
+    select PACKAGE_kmod-e1000