Browse Source

x86-generic: build all images with the same modules, use the same sysupgrade image for all profiles

Matthias Schiffer 9 years ago
parent
commit
b280f73d34
1 changed files with 8 additions and 5 deletions
  1. 8 5
      targets/x86-generic/profiles.mk

+ 8 - 5
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))