distro: conditionally include basesystem/filesystem

The `basesystem` package is being obsoleted by `filesystem` in Rawhide (F43). Change the definition of the `iot-commit` to conditionally include the correct package based on the Fedora version. Signed-off-by: Micah Abbott <[email protected]>
osbuild · Feb 7, 2025 · 8349b49 · 8349b49
1 parent 17fe1ef
commit 8349b49
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/pkg/distro/fedora/package_sets.go b/pkg/distro/fedora/package_sets.go
@@ -80,7 +80,6 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
 			"atheros-firmware",
 			"attr",
 			"authselect",
-			"basesystem",
 			"bash",
 			"bash-completion",
 			"brcmfmac-firmware",
@@ -196,6 +195,22 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
 			},
 		})
 	}
+	// See https://pagure.io/fedora-iot/ostree/pull-request/72
+	// See https://src.fedoraproject.org/rpms/filesystem/c/3f741bf2a89c9e1bb685943c41fd298e6683dd50?branch=rawhide
+	if common.VersionLessThan(t.arch.distro.osVersion, "43") {
+		ps = ps.Append(rpmmd.PackageSet{
+			Include: []string{
+				"basesystem",
+			},
+		})
+	}
+	if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "43") {
+		ps = ps.Append(rpmmd.PackageSet{
+			Include: []string{
+				"filesystem",
+			},
+		})
+	}
 
 	return ps
 }