From b280f73d34b742544dd00bac913905ef7432ef31 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 16 Mar 2015 00:54:46 +0100
Subject: [PATCH] x86-generic: build all images with the same modules, use the
 same sysupgrade image for all profiles

---
 targets/x86-generic/profiles.mk | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
index 65b1bb5d6..6bd9c94f2 100644
--- a/targets/x86-generic/profiles.mk
+++ b/targets/x86-generic/profiles.mk
@@ -1,14 +1,17 @@
-$(eval $(call GluonProfile,GENERIC,kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity))
+X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity
+
+
+$(eval $(call GluonProfile,GENERIC,$(X86_GENERIC_NETWORK_MODULES)))
 $(eval $(call GluonProfileFactorySuffix,GENERIC,-ext4,.img.gz))
 $(eval $(call GluonProfileSysupgradeSuffix,GENERIC,-ext4,.img.gz))
 $(eval $(call GluonModel,GENERIC,combined,x86-generic))
 
-$(eval $(call GluonProfile,VDI,kmod-pcnet32 kmod-e1000))
+$(eval $(call GluonProfile,VDI,$(X86_GENERIC_NETWORK_MODULES)))
 $(eval $(call GluonProfileFactorySuffix,VDI,-ext4,.vdi))
-$(eval $(call GluonProfileSysupgradeSuffix,VDI,-ext4,.img.gz))
+$(eval $(call GluonProfileSysupgradeSuffix,VDI))
 $(eval $(call GluonModel,VDI,combined,x86-virtualbox))
 
-$(eval $(call GluonProfile,VMDK,kmod-pcnet32))
+$(eval $(call GluonProfile,VMDK,$(X86_GENERIC_NETWORK_MODULES)))
 $(eval $(call GluonProfileFactorySuffix,VMDK,-ext4,.vmdk))
-$(eval $(call GluonProfileSysupgradeSuffix,VMDK,-ext4,.img.gz))
+$(eval $(call GluonProfileSysupgradeSuffix,VMDK))
 $(eval $(call GluonModel,VMDK,combined,x86-vmware))
-- 
GitLab