distro: remove Fedora 38 conditions from image definitions

osbuild · Jun 5, 2024 · aad2c71 · aad2c71
1 parent cecc2c9
commit aad2c71
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 72 deletions.
diff --git a/pkg/distro/fedora/distro.go b/pkg/distro/fedora/distro.go
@@ -872,7 +872,6 @@ func newDistro(version int) distro.Distro {
 		minimalrawImgType,
 	)
 
-	// iot simplified installer was introduced in F38
 	x86_64.addImageTypes(
 		&platform.X86{
 			BasePlatform: platform.BasePlatform{
@@ -921,62 +920,59 @@ func newDistro(version int) distro.Distro {
 		iotSimplifiedInstallerImgType,
 	)
 
-	if common.VersionGreaterThanOrEqual(rd.Releasever(), "39") {
-		// bootc was introduced in F39
-		x86_64.addImageTypes(
-			&platform.X86{
-				BasePlatform: platform.BasePlatform{
-					FirmwarePackages: []string{
-						"biosdevname",
-						"iwlwifi-dvm-firmware",
-						"iwlwifi-mvm-firmware",
-						"microcode_ctl",
-					},
+	x86_64.addImageTypes(
+		&platform.X86{
+			BasePlatform: platform.BasePlatform{
+				FirmwarePackages: []string{
+					"biosdevname",
+					"iwlwifi-dvm-firmware",
+					"iwlwifi-mvm-firmware",
+					"microcode_ctl",
 				},
-				BIOS:       true,
-				UEFIVendor: "fedora",
 			},
-			iotBootableContainer,
-		)
-		aarch64.addImageTypes(
-			&platform.Aarch64{
-				BasePlatform: platform.BasePlatform{
-					FirmwarePackages: []string{
-						"arm-image-installer",
-						"bcm283x-firmware",
-						"brcmfmac-firmware",
-						"iwlwifi-mvm-firmware",
-						"realtek-firmware",
-						"uboot-images-armv8",
-					},
+			BIOS:       true,
+			UEFIVendor: "fedora",
+		},
+		iotBootableContainer,
+	)
+	aarch64.addImageTypes(
+		&platform.Aarch64{
+			BasePlatform: platform.BasePlatform{
+				FirmwarePackages: []string{
+					"arm-image-installer",
+					"bcm283x-firmware",
+					"brcmfmac-firmware",
+					"iwlwifi-mvm-firmware",
+					"realtek-firmware",
+					"uboot-images-armv8",
 				},
-				UEFIVendor: "fedora",
 			},
-			iotBootableContainer,
-		)
-
-		ppc64le.addImageTypes(
-			&platform.PPC64LE{
-				BIOS: true,
-				BasePlatform: platform.BasePlatform{
-					ImageFormat: platform.FORMAT_QCOW2,
-					QCOW2Compat: "1.1",
-				},
+			UEFIVendor: "fedora",
+		},
+		iotBootableContainer,
+	)
+
+	ppc64le.addImageTypes(
+		&platform.PPC64LE{
+			BIOS: true,
+			BasePlatform: platform.BasePlatform{
+				ImageFormat: platform.FORMAT_QCOW2,
+				QCOW2Compat: "1.1",
 			},
-			iotBootableContainer,
-		)
-
-		s390x.addImageTypes(
-			&platform.S390X{
-				Zipl: true,
-				BasePlatform: platform.BasePlatform{
-					ImageFormat: platform.FORMAT_QCOW2,
-					QCOW2Compat: "1.1",
-				},
+		},
+		iotBootableContainer,
+	)
+
+	s390x.addImageTypes(
+		&platform.S390X{
+			Zipl: true,
+			BasePlatform: platform.BasePlatform{
+				ImageFormat: platform.FORMAT_QCOW2,
+				QCOW2Compat: "1.1",
 			},
-			iotBootableContainer,
-		)
-	}
+		},
+		iotBootableContainer,
+	)
 
 	ppc64le.addImageTypes(
 		&platform.PPC64LE{

diff --git a/pkg/distro/fedora/distro_test.go b/pkg/distro/fedora/distro_test.go
@@ -20,10 +20,6 @@ type fedoraFamilyDistro struct {
 }
 
 var fedoraFamilyDistros = []fedoraFamilyDistro{
-	{
-		name:   "fedora-38",
-		distro: fedora.DistroFactory("fedora-38"),
-	},
 	{
 		name:   "fedora-39",
 		distro: fedora.DistroFactory("fedora-39"),

diff --git a/pkg/distro/fedora/package_sets.go b/pkg/distro/fedora/package_sets.go
@@ -474,14 +474,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
 		},
 	})
 
-	if common.VersionLessThan(t.arch.distro.osVersion, "39") {
-		ps = ps.Append(rpmmd.PackageSet{
-			Include: []string{
-				"lklug-fonts", // orphaned, unavailable in F39
-			},
-		})
-	}
-
 	switch t.Arch().Name() {
 	case arch.ARCH_X86_64.String():
 		ps = ps.Append(rpmmd.PackageSet{
@@ -627,14 +619,6 @@ func containerPackageSet(t *imageType) rpmmd.PackageSet {
 		},
 	}
 
-	if common.VersionLessThan(t.arch.distro.osVersion, "39") {
-		ps = ps.Append(rpmmd.PackageSet{
-			Include: []string{
-				"fedora-repos-modular",
-			},
-		})
-	}
-
 	return ps
 }
 
@@ -705,7 +689,8 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
 				"shadow-utils", // includes passwd
 			},
 		})
-	} else if common.VersionLessThan(t.arch.distro.osVersion, "40") {
+	} else {
+		// F39 only
 		ps = ps.Append(rpmmd.PackageSet{
 			Include: []string{
 				"passwd",