From 01863263a935f3169bdce3a6eb0c264f49c9cbfe Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 25 Jan 2015 03:31:58 +0100
Subject: [PATCH] Build VMDK and VDI images for x86

x86-generic is still marked as broken as fastd v16 doesn't work with uClibc on
x86. This will be fixed with fastd v17.
---
 targets/x86-generic/config      |  5 ++---
 targets/x86-generic/profiles.mk | 12 +++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/targets/x86-generic/config b/targets/x86-generic/config
index 222a2258b..e70b7455a 100644
--- a/targets/x86-generic/config
+++ b/targets/x86-generic/config
@@ -1,4 +1,3 @@
 CONFIG_TARGET_x86=y
-CONFIG_X86_USE_GRUB2=y
-CONFIG_X86_VDI_IMAGES=y
-CONFIG_X86_VMDK_IMAGES=y
+CONFIG_VDI_IMAGES=y
+CONFIG_VMDK_IMAGES=y
diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
index d3a429297..8370368a2 100644
--- a/targets/x86-generic/profiles.mk
+++ b/targets/x86-generic/profiles.mk
@@ -1 +1,11 @@
-$(eval $(call GluonProfile,Generic))
+$(eval $(call GluonProfile,VDI,kmod-pcnet32))
+$(eval $(call GluonProfileFactorySuffix,VDI))
+$(eval $(call GluonProfileSysupgradeSuffix,VDI))
+$(eval $(call GluonProfileExtraSuffix,VDI,.vdi))
+$(eval $(call GluonModel,VDI,combined-squashfs,x86-virtualbox))
+
+$(eval $(call GluonProfile,VMDK,kmod-pcnet32))
+$(eval $(call GluonProfileFactorySuffix,VMDK))
+$(eval $(call GluonProfileSysupgradeSuffix,VMDK))
+$(eval $(call GluonProfileExtraSuffix,VMDK,.vmdk))
+$(eval $(call GluonModel,VMDK,combined-squashfs,x86-vmware))
-- 
GitLab