bib: move bib to new platform.Data{}

In images osbuild/images#1739 we
dropped the hardcoded platforms. Bib needs to follow suite
and this commit does it now.

Author: mvo5

bib/cmd/bootc-image-builder/image.go

@@ -385,40 +385,18 @@ func manifestForDiskImage(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest
 		"console=ttyS0",
 	}
 
+	img.Platform = &platform.Data{
+		Arch:        c.Architecture,
+		UEFIVendor:  c.SourceInfo.UEFIVendor,
+		QCOW2Compat: "1.1",
+	}
 	switch c.Architecture {
 	case arch.ARCH_X86_64:
-		img.Platform = &platform.X86{
-			BasePlatform: platform.BasePlatform{},
-			BIOS:         true,
-		}
-	case arch.ARCH_AARCH64:
-		img.Platform = &platform.Aarch64{
-			UEFIVendor: "fedora",
-			BasePlatform: platform.BasePlatform{
-				QCOW2Compat: "1.1",
-			},
-		}
-	case arch.ARCH_S390X:
-		img.Platform = &platform.S390X{
-			BasePlatform: platform.BasePlatform{
-				QCOW2Compat: "1.1",
-			},
-			Zipl: true,
-		}
+		img.Platform.(*platform.Data).BIOSPlatform = "i386-pc"
 	case arch.ARCH_PPC64LE:
-		img.Platform = &platform.PPC64LE{
-			BasePlatform: platform.BasePlatform{
-				QCOW2Compat: "1.1",
-			},
-			BIOS: true,
-		}
-	case arch.ARCH_RISCV64:
-		img.Platform = &platform.RISCV64{
-			UEFIVendor: "fedora",
-			BasePlatform: platform.BasePlatform{
-				QCOW2Compat: "1.1",
-			},
-		}
+		img.Platform.(*platform.Data).BIOSPlatform = "powerpc-ieee1275"
+	case arch.ARCH_S390X:
+		img.Platform.(*platform.Data).ZiplSupport = true
 	}
 
 	if kopts := customizations.GetKernel(); kopts != nil && kopts.Append != "" {
@@ -559,48 +537,26 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro
 	}
 	img.InstallerCustomizations.UseRHELLoraxTemplates = needsRHELLoraxTemplates(c.SourceInfo.OSRelease)
 
+	img.Platform = &platform.Data{
+		Arch:        c.Architecture,
+		ImageFormat: platform.FORMAT_ISO,
+		UEFIVendor:  c.SourceInfo.UEFIVendor,
+	}
 	switch c.Architecture {
 	case arch.ARCH_X86_64:
-		img.Platform = &platform.X86{
-			BasePlatform: platform.BasePlatform{
-				ImageFormat: platform.FORMAT_ISO,
-			},
-			BIOS:       true,
-			UEFIVendor: c.SourceInfo.UEFIVendor,
-		}
+		img.Platform.(*platform.Data).BIOSPlatform = "i386-pc"
 		img.InstallerCustomizations.ISOBoot = manifest.Grub2ISOBoot
 	case arch.ARCH_AARCH64:
 		// aarch64 always uses UEFI, so let's enforce the vendor
 		if c.SourceInfo.UEFIVendor == "" {
 			return nil, fmt.Errorf("UEFI vendor must be set for aarch64 ISO")
 		}
-		img.Platform = &platform.Aarch64{
-			BasePlatform: platform.BasePlatform{
-				ImageFormat: platform.FORMAT_ISO,
-			},
-			UEFIVendor: c.SourceInfo.UEFIVendor,
-		}
 	case arch.ARCH_S390X:
-		img.Platform = &platform.S390X{
-			Zipl: true,
-			BasePlatform: platform.BasePlatform{
-				ImageFormat: platform.FORMAT_ISO,
-			},
-		}
+		img.Platform.(*platform.Data).ZiplSupport = true
 	case arch.ARCH_PPC64LE:
-		img.Platform = &platform.PPC64LE{
-			BIOS: true,
-			BasePlatform: platform.BasePlatform{
-				ImageFormat: platform.FORMAT_ISO,
-			},
-		}
+		img.Platform.(*platform.Data).BIOSPlatform = "powerpc-ieee1275"
 	case arch.ARCH_RISCV64:
-		img.Platform = &platform.RISCV64{
-			BasePlatform: platform.BasePlatform{
-				ImageFormat: platform.FORMAT_ISO,
-			},
-			UEFIVendor: c.SourceInfo.UEFIVendor,
-		}
+		// nothing special needed
 	default:
 		return nil, fmt.Errorf("unsupported architecture %v", c.Architecture)
 	}