particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/fedora: remove obsolete conditions for package set

Browse source 
osbuild-composer no longer supports Fedora 36, so we are safe to drop these
now.

iotCommitPackageSet would really benefit from sorting, but that would
create hard to handle conflicts with other PRs upstream, so I decided
not to do it in this commit.

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2023-06-27 13:33:35 +02:00 • committed by Achilleas Koutsou
parent 78931c0f05
commit b5c9feeff9
1 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

32
internal/distro/fedora/package_sets.go
View file

@ -172,23 +172,10 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
"dbus-parsec",
"iwl7260-firmware",
"iwlax2xx-firmware",
"greenboot-default-health-checks",
},
}
if common.VersionLessThan(t.arch.distro.osVersion, "36") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"greenboot-grub2",
"greenboot-reboot",
"greenboot-rpm-ostree-grub2",
"greenboot-status",
},
},
)
} else {
ps = ps.Append(rpmmd.PackageSet{Include: []string{"greenboot-default-health-checks"}})
}
return ps
}
@ -338,6 +325,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
"plymouth",
"python3-pyatspi",
"rdma-core",
"rit-meera-new-fonts",
"rng-tools",
"rpcbind",
"rpm-ostree",
@ -347,6 +335,7 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
"sg3_utils",
"sil-abyssinica-fonts",
"sil-padauk-fonts",
"sil-scheherazade-new-fonts",
"smartmontools",
"spice-vdagent",
"strace",
@ -380,21 +369,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
},
})
}
if common.VersionLessThan(t.arch.distro.osVersion, "37") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"smc-meera-fonts",
"sil-scheherazade-fonts",
},
})
} else {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"rit-meera-new-fonts",
"sil-scheherazade-new-fonts",
},
})
}
switch t.Arch().Name() {
case platform.ARCH_X86_64.String():