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

images: update dependency

Browse source 
Update the images dependency to get the new version gates for Fedora.
This commit is contained in:
Simon de Vlieger 2024-03-04 08:47:59 +01:00 • committed by Tomáš Hozza
parent b4dcfc4480
commit 073e304978
21 changed files with 825 additions and 719 deletions
Download patch file Download diff file Expand all files Collapse all files

25
vendor/github.com/osbuild/images/pkg/distro/fedora/images.go generated vendored
View file

@ -354,24 +354,15 @@ func imageInstallerImage(workload workload.Workload,
img.UnattendedKickstart = instCust.Unattended
}
distro := t.Arch().Distro()
if common.VersionGreaterThanOrEqual(distro.Releasever(), "39") {
img.AdditionalAnacondaModules = []string{
"org.fedoraproject.Anaconda.Modules.Security",
"org.fedoraproject.Anaconda.Modules.Timezone",
"org.fedoraproject.Anaconda.Modules.Localization",
}
if img.UnattendedKickstart {
// NOTE: this is not supported right now because the
// image-installer on Fedora isn't working when unattended.
// These options are probably necessary but could change.
// Unattended/non-interactive installations are better set to text
// time since they might be running headless and a UI is
// unnecessary.
img.AdditionalKernelOpts = []string{"inst.text", "inst.noninteractive"}
}
if img.UnattendedKickstart {
// NOTE: this is not supported right now because the
// image-installer on Fedora isn't working when unattended.
// These options are probably necessary but could change.
// Unattended/non-interactive installations are better set to text
// time since they might be running headless and a UI is
// unnecessary.
img.AdditionalKernelOpts = []string{"inst.text", "inst.noninteractive"}
}
img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules, "org.fedoraproject.Anaconda.Modules.Users")
img.Platform = t.platform
img.Workload = workload

40
vendor/github.com/osbuild/images/pkg/distro/fedora/package_sets.go generated vendored
View file

@ -138,10 +138,8 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
"openssh-server",
"openssl",
"parsec",
"passwd",
"pinentry",
"podman",
"podman-plugins",
"policycoreutils",
"policycoreutils-python-utils",
"polkit",
@ -177,6 +175,15 @@ func iotCommitPackageSet(t *imageType) rpmmd.PackageSet {
},
}
if common.VersionLessThan(t.arch.distro.osVersion, "40") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"passwd", // provided by shadow-utils in F40+
"podman-plugins", // deprecated in podman 5
},
})
}
return ps
}
@ -221,7 +228,7 @@ func bootableContainerPackageSet(t *imageType) rpmmd.PackageSet {
"openssh-server",
"openssl",
"ostree",
"passwd", "shadow-utils", // User configuration
"shadow-utils", // User configuration
"podman",
"rpm-ostree",
"selinux-policy-targeted",
@ -250,6 +257,14 @@ func bootableContainerPackageSet(t *imageType) rpmmd.PackageSet {
},
}
if common.VersionLessThan(t.arch.distro.osVersion, "40") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"passwd", // provided by shadow-utils in F40+
},
})
}
switch t.Arch().Name() {
case arch.ARCH_AARCH64.String():
ps.Append(rpmmd.PackageSet{
@ -531,7 +546,7 @@ func liveInstallerPackageSet(t *imageType) rpmmd.PackageSet {
},
}
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "39") {
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "41") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"anaconda-webui",
@ -545,7 +560,7 @@ func liveInstallerPackageSet(t *imageType) rpmmd.PackageSet {
func imageInstallerPackageSet(t *imageType) rpmmd.PackageSet {
ps := anacondaPackageSet(t)
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "39") {
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "41") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"anaconda-webui",
@ -667,7 +682,6 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
"lvm2",
"mdadm",
"nss-softokn",
"passwd",
"policycoreutils",
"policycoreutils-python-utils",
"procps-ng",
@ -679,5 +693,19 @@ func iotSimplifiedInstallerPackageSet(t *imageType) rpmmd.PackageSet {
},
})
if common.VersionGreaterThanOrEqual(t.arch.distro.osVersion, "40") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"shadow-utils", // includes passwd
},
})
} else if common.VersionLessThan(t.arch.distro.osVersion, "40") {
ps = ps.Append(rpmmd.PackageSet{
Include: []string{
"passwd",
},
})
}
return ps
}