Skip to content

Commit

Permalink
Remove dnsmasq from iot package sets package_sets.go
Browse files Browse the repository at this point in the history
Removes the `dnsmasq` package from iot package sets to bring package list in line with current iot package list here: https://pagure.io/fedora-iot/ostree/blob/main/f/fedora-iot-base.yaml
  • Loading branch information
djach7 authored and achilleas-k committed Jan 13, 2025
1 parent 7781bd2 commit 2600d79
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions pkg/distro/fedora/package_sets.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
"cryptsetup",
"curl",
"dbus-parsec",
"dnsmasq",
"dosfstools",
"dracut-config-generic",
"dracut-network",
Expand Down Expand Up @@ -183,6 +182,13 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
},
})
}
if common.VersionLessThan(t.arch.distro.osVersion, "41") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"dnsmasq", // deprecated for F41+
},
})
}
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "41") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
Expand Down Expand Up @@ -653,7 +659,6 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
"coreos-installer-dracut",
"coreutils",
"device-mapper-multipath",
"dnsmasq",
"dosfstools",
"dracut-live",
"e2fsprogs",
Expand Down Expand Up @@ -697,6 +702,13 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
},
})
}
if common.VersionLessThan(t.arch.distro.osVersion, "41") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"dnsmasq", // deprecated for F41+
},
})
}

return ps
}

0 comments on commit 2600d79

Please sign in to comment.