From c12f2c61e2bc540f3f6e0bd19004005ddd1a2c23 Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Thu, 19 Jan 2023 21:04:19 +0100 Subject: [PATCH] distro/rhel7: and add platforms to image types --- internal/distro/rhel7/distro.go | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/internal/distro/rhel7/distro.go b/internal/distro/rhel7/distro.go index 0bf42255c..c19b9bff8 100644 --- a/internal/distro/rhel7/distro.go +++ b/internal/distro/rhel7/distro.go @@ -14,6 +14,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/disk" "github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/osbuild" + "github.com/osbuild/osbuild-composer/internal/platform" "github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/runner" ) @@ -174,13 +175,14 @@ func (a *architecture) GetImageType(name string) (distro.ImageType, error) { return t, nil } -func (a *architecture) addImageTypes(imageTypes ...imageType) { +func (a *architecture) addImageTypes(platform platform.Platform, imageTypes ...imageType) { if a.imageTypes == nil { a.imageTypes = map[string]distro.ImageType{} } for idx := range imageTypes { it := imageTypes[idx] it.arch = a + it.platform = platform a.imageTypes[it.name] = &it for _, alias := range it.nameAliases { if a.imageTypeAliases == nil { @@ -205,6 +207,7 @@ type packageSetFunc func(t *imageType) rpmmd.PackageSet type imageType struct { arch *architecture + platform platform.Platform name string nameAliases []string filename string @@ -465,7 +468,25 @@ func newDistro(distroName string) distro.Distro { } x86_64.addImageTypes( + &platform.X86{ + BIOS: true, + UEFIVendor: rd.vendor, + BasePlatform: platform.BasePlatform{ + ImageFormat: platform.FORMAT_QCOW2, + QCOW2Compat: "0.10", + }, + }, qcow2ImgType, + ) + + x86_64.addImageTypes( + &platform.X86{ + BIOS: true, + UEFIVendor: rd.vendor, + BasePlatform: platform.BasePlatform{ + ImageFormat: platform.FORMAT_VHD, + }, + }, azureRhuiImgType, )