deps: update images to 0.94

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>

vendor/github.com/osbuild/images/pkg/manifest/coreos_installer.go

@@ -185,11 +185,34 @@ func (p *CoreOSInstaller) serialize() osbuild.Pipeline {
 
 	dracutModules := append(
 		p.AdditionalDracutModules,
+		"systemd",
+		"systemd-initrd",
+		"fips",
+		"modsign",
+		"rescue",
+		"i18n",
+		"kernel-modules",
+		"kernel-modules-extra",
+		"network-manager",
+		"network",
+		"drm",
 		"coreos-installer",
 		"fdo",
+		"lvm",
+		"terminfo",
+		"fs-lib",
+		"dracut-systemd",
+		"debug",
+		"shutdown",
 	)
-
-	dracutStageOptions := dracutStageOptions(p.kernelVer, p.Biosdevname, dracutModules)
+	if p.Biosdevname {
+		dracutModules = append(dracutModules, "biosdevname")
+	}
+	dracutStageOptions := &osbuild.DracutStageOptions{
+		Kernel:  []string{p.kernelVer},
+		Modules: dracutModules,
+		Install: []string{"/.buildstamp"},
+	}
 	if p.FDO != nil && p.FDO.DiunPubKeyRootCerts != "" {
 		pipeline.AddStage(osbuild.NewFDOStageForRootCerts(p.FDO.DiunPubKeyRootCerts))
 		dracutStageOptions.Install = []string{"/fdo_diun_pub_key_root_certs.pem"}

vendor/github.com/osbuild/images/pkg/manifest/os.go

@@ -163,7 +163,6 @@ type OS struct {
 	// OSTreeParent source spec (optional). If nil the new commit (if
 	// applicable) will have no parent
 	OSTreeParent *ostree.SourceSpec
-
 	// Enabling Bootupd runs bootupctl generate-update-metadata in the tree to
 	// transform /usr/lib/ostree-boot into a bootupd-compatible update
 	// payload. Only works with ostree-based images.
@@ -289,6 +288,25 @@ func (p *OS) getContainerSources() []container.SourceSpec {
 	return p.OSCustomizations.Containers
 }
 
+func tomlPkgsFor(distro Distro) []string {
+	switch distro {
+	case DISTRO_EL7:
+		// nothing needs toml in rhel7
+		panic("no support for toml on rhel7")
+	case DISTRO_EL8:
+		// deprecated, needed for backwards compatibility (EL8 manifests)
+		return []string{"python3-pytoml"}
+	case DISTRO_EL9:
+		// older unmaintained lib, needed for backwards compatibility
+		return []string{"python3-toml"}
+	default:
+		// No extra package needed for reading, on rhel10 and
+		// fedora as stdlib has "tomlib" but we need tomli-w
+		// for writing
+		return []string{"python3-tomli-w"}
+	}
+}
+
 func (p *OS) getBuildPackages(distro Distro) []string {
 	packages := p.platform.GetBuildPackages()
 	if p.PartitionTable != nil {
@@ -315,13 +333,7 @@ func (p *OS) getBuildPackages(distro Distro) []string {
 
 	if len(p.OSCustomizations.Containers) > 0 {
 		if p.OSCustomizations.ContainersStorage != nil {
-			switch distro {
-			case DISTRO_EL8:
-				packages = append(packages, "python3-pytoml")
-			case DISTRO_EL10:
-			default:
-				packages = append(packages, "python3-toml")
-			}
+			packages = append(packages, tomlPkgsFor(distro)...)
 		}
 		packages = append(packages, "skopeo")
 	}
@@ -331,13 +343,7 @@ func (p *OS) getBuildPackages(distro Distro) []string {
 	}
 
 	if p.BootcConfig != nil {
-		switch distro {
-		case DISTRO_EL8:
-			packages = append(packages, "python3-pytoml")
-		case DISTRO_EL10:
-		default:
-			packages = append(packages, "python3-toml")
-		}
+		packages = append(packages, tomlPkgsFor(distro)...)
 	}
 
 	return packages

vendor/github.com/osbuild/images/pkg/manifest/tar.go

@@ -10,12 +10,13 @@ type Tar struct {
 	Base
 	filename string
 
-	Format   osbuild.TarArchiveFormat
-	RootNode osbuild.TarRootNode
-	Paths    []string
-	ACLs     *bool
-	SELinux  *bool
-	Xattrs   *bool
+	Format    osbuild.TarArchiveFormat
+	RootNode  osbuild.TarRootNode
+	Paths     []string
+	ACLs      *bool
+	SELinux   *bool
+	Xattrs    *bool
+	Transform string
 
 	inputPipeline Pipeline
 }
@@ -50,13 +51,14 @@ func (p *Tar) serialize() osbuild.Pipeline {
 	pipeline := p.Base.serialize()
 
 	tarOptions := &osbuild.TarStageOptions{
-		Filename: p.Filename(),
-		Format:   p.Format,
-		ACLs:     p.ACLs,
-		SELinux:  p.SELinux,
-		Xattrs:   p.Xattrs,
-		RootNode: p.RootNode,
-		Paths:    p.Paths,
+		Filename:  p.Filename(),
+		Format:    p.Format,
+		ACLs:      p.ACLs,
+		SELinux:   p.SELinux,
+		Xattrs:    p.Xattrs,
+		RootNode:  p.RootNode,
+		Paths:     p.Paths,
+		Transform: p.Transform,
 	}
 	tarStage := osbuild.NewTarStage(tarOptions, p.inputPipeline.Name())
 	pipeline.AddStage(tarStage)