go.mod: update osbuild/images to v0.156.0
tag v0.155.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.155.0 ---------------- * Fedora 43: add shadow-utils when LockRoot is enabled, update cloud-init service name (osbuild/images#1618) * Author: Achilleas Koutsou, Reviewers: Gianluca Zuccarelli, Michael Vogt * Update osbuild dependency commit ID to latest (osbuild/images#1609) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250626 (osbuild/images#1623) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: xz compress azure-cvm image type [HMS-8587] (osbuild/images#1620) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: introduce new image type: Azure SAP Apps [HMS-8738] (osbuild/images#1612) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: move ansible-core to sap_extras_pkgset (osbuild/images#1624) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza * github/create-tag: allow passing the version when run manually (osbuild/images#1621) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: move image-config into pure YAML (HMS-8593) (osbuild/images#1616) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: split manifest checksums into separate files (osbuild/images#1625) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-30 --- tag v0.156.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.156.0 ---------------- * Many: delete repositories for EOL distributions (HMS-7044) (osbuild/images#1607) * Author: Tomáš Hozza, Reviewers: Michael Vogt, Simon de Vlieger * RHSM/facts: add 'image-builder CLI' API type (osbuild/images#1640) * Author: Tomáš Hozza, Reviewers: Brian C. Lane, Simon de Vlieger * Update dependencies 2025-06-29 (osbuild/images#1628) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1627) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * [RFC] image: drop `InstallWeakDeps` from image.DiskImage (osbuild/images#1642) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger, Tomáš Hozza * build(deps): bump the go-deps group across 1 directory with 3 updates (osbuild/images#1632) * Author: dependabot[bot], Reviewers: SchutzBot, Tomáš Hozza * distro/rhel10: xz compress azure-cvm image type (osbuild/images#1638) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger * distro: cleanup/refactor distro/{defs,generic} (HMS-8744) (osbuild/images#1570) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: remove some hardcoded values from generic/images.go (osbuild/images#1636) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: small tweaks for the YAML based imagetypes (osbuild/images#1622) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora/wsl: packages and locale (osbuild/images#1635) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * image/many: make compression more generic (osbuild/images#1634) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * manifest: handle content template name with spaces (osbuild/images#1641) * Author: Bryttanie, Reviewers: Brian C. Lane, Michael Vogt, Tomáš Hozza * many: implement gzip (osbuild/images#1633) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * rhel/azure: set GRUB_TERMINAL based on architecture [RHEL-91383] (osbuild/images#1626) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-07-07 ---
This commit is contained in:
Achilleas Koutsou
parent
60c5f10af8
commit
3fd7092db5
1486 changed files with 124742 additions and 82516 deletions
10
vendor/github.com/osbuild/images/pkg/distro/generic/distro.go
generated
vendored
10
vendor/github.com/osbuild/images/pkg/distro/generic/distro.go
generated
vendored
|
|
@ -73,7 +73,7 @@ func (d *distribution) getISOLabelFunc(isoLabel string) isoLabelFunc {
|
|||
}
|
||||
|
||||
func newDistro(nameVer string) (distro.Distro, error) {
|
||||
distroYAML, err := defs.Distro(nameVer)
|
||||
distroYAML, err := defs.NewDistroYAML(nameVer)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -84,15 +84,11 @@ func newDistro(nameVer string) (distro.Distro, error) {
|
|||
rd := &distribution{
|
||||
DistroYAML: *distroYAML,
|
||||
|
||||
defaultImageConfig: common.Must(defs.DistroImageConfig(nameVer)),
|
||||
defaultImageConfig: distroYAML.ImageConfig(),
|
||||
arches: make(map[string]*architecture),
|
||||
}
|
||||
|
||||
its, err := defs.ImageTypes(rd.Name())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, imgTypeYAML := range its {
|
||||
for _, imgTypeYAML := range distroYAML.ImageTypes() {
|
||||
// use as marker for images that are not converted to
|
||||
// YAML yet
|
||||
if imgTypeYAML.Filename == "" {
|
||||
|
|
|
|||
5
vendor/github.com/osbuild/images/pkg/distro/generic/imagedefs.go
generated
vendored
5
vendor/github.com/osbuild/images/pkg/distro/generic/imagedefs.go
generated
vendored
|
|
@ -8,13 +8,12 @@ import (
|
|||
)
|
||||
|
||||
func newImageTypeFrom(d *distribution, ar *architecture, imgYAML defs.ImageTypeYAML) imageType {
|
||||
typName := imgYAML.Name()
|
||||
it := imageType{
|
||||
ImageTypeYAML: imgYAML,
|
||||
isoLabel: d.getISOLabelFunc(imgYAML.ISOLabel),
|
||||
}
|
||||
it.defaultImageConfig = common.Must(defs.ImageConfig(d.Name(), ar.name, typName))
|
||||
it.defaultInstallerConfig = common.Must(defs.InstallerConfig(d.Name(), ar.name, typName))
|
||||
it.defaultImageConfig = common.Must(it.ImageConfig(d.Name(), ar.name))
|
||||
it.defaultInstallerConfig = common.Must(it.InstallerConfig(d.Name(), ar.name))
|
||||
|
||||
switch imgYAML.Image {
|
||||
case "disk":
|
||||
|
|
|
|||
42
vendor/github.com/osbuild/images/pkg/distro/generic/images.go
generated
vendored
42
vendor/github.com/osbuild/images/pkg/distro/generic/images.go
generated
vendored
|
|
@ -593,21 +593,9 @@ func iotCommitImage(workload workload.Workload,
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// see https://github.com/ostreedev/ostree/issues/2840
|
||||
img.OSCustomizations.Presets = []osbuild.Preset{
|
||||
{
|
||||
Name: "ignition-firstboot-complete.service",
|
||||
State: osbuild.StateEnable,
|
||||
},
|
||||
{
|
||||
Name: "coreos-ignition-write-issues.service",
|
||||
State: osbuild.StateEnable,
|
||||
},
|
||||
{
|
||||
Name: "fdo-client-linuxapp.service",
|
||||
State: osbuild.StateEnable,
|
||||
},
|
||||
imgConfig := t.getDefaultImageConfig()
|
||||
if imgConfig != nil {
|
||||
img.OSCustomizations.Presets = imgConfig.Presets
|
||||
}
|
||||
|
||||
img.Environment = &t.ImageTypeYAML.Environment
|
||||
|
|
@ -679,20 +667,9 @@ func iotContainerImage(workload workload.Workload,
|
|||
return nil, err
|
||||
}
|
||||
|
||||
// see https://github.com/ostreedev/ostree/issues/2840
|
||||
img.OSCustomizations.Presets = []osbuild.Preset{
|
||||
{
|
||||
Name: "ignition-firstboot-complete.service",
|
||||
State: osbuild.StateEnable,
|
||||
},
|
||||
{
|
||||
Name: "coreos-ignition-write-issues.service",
|
||||
State: osbuild.StateEnable,
|
||||
},
|
||||
{
|
||||
Name: "fdo-client-linuxapp.service",
|
||||
State: osbuild.StateEnable,
|
||||
},
|
||||
imgConfig := t.getDefaultImageConfig()
|
||||
if imgConfig != nil {
|
||||
img.OSCustomizations.Presets = imgConfig.Presets
|
||||
}
|
||||
|
||||
img.ContainerLanguage = img.OSCustomizations.Language
|
||||
|
|
@ -751,12 +728,6 @@ func iotInstallerImage(workload workload.Workload,
|
|||
img.DisabledAnacondaModules = append(img.DisabledAnacondaModules, instCust.Modules.Disable...)
|
||||
}
|
||||
|
||||
img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules, []string{
|
||||
anaconda.ModuleTimezone,
|
||||
anaconda.ModuleLocalization,
|
||||
anaconda.ModuleUsers,
|
||||
}...)
|
||||
|
||||
installerConfig, err := t.getDefaultInstallerConfig()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
@ -765,6 +736,7 @@ func iotInstallerImage(workload workload.Workload,
|
|||
if installerConfig != nil {
|
||||
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
|
||||
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
|
||||
img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules, installerConfig.AdditionalAnacondaModules...)
|
||||
if installerConfig.SquashfsRootfs != nil && *installerConfig.SquashfsRootfs {
|
||||
img.RootfsType = manifest.SquashfsRootfs
|
||||
}
|
||||
|
|
|
|||
7
vendor/github.com/osbuild/images/pkg/distro/generic/imagetype.go
generated
vendored
7
vendor/github.com/osbuild/images/pkg/distro/generic/imagetype.go
generated
vendored
|
|
@ -40,8 +40,7 @@ type imageType struct {
|
|||
platform platform.Platform
|
||||
|
||||
// XXX: make definable via YAML
|
||||
workload workload.Workload
|
||||
// XXX: make member function ImageTypeYAML
|
||||
workload workload.Workload
|
||||
defaultImageConfig *distro.ImageConfig
|
||||
defaultInstallerConfig *distro.InstallerConfig
|
||||
|
||||
|
|
@ -127,7 +126,7 @@ func (t *imageType) BootMode() platform.BootMode {
|
|||
}
|
||||
|
||||
func (t *imageType) BasePartitionTable() (*disk.PartitionTable, error) {
|
||||
return defs.PartitionTable(t)
|
||||
return t.ImageTypeYAML.PartitionTable(t.arch.distro.Name(), t.arch.name)
|
||||
}
|
||||
|
||||
func (t *imageType) getPartitionTable(customizations *blueprint.Customizations, options distro.ImageOptions, rng *rand.Rand) (*disk.PartitionTable, error) {
|
||||
|
|
@ -222,7 +221,7 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
|
|||
|
||||
// don't add any static packages if Minimal was selected
|
||||
if !bp.Minimal {
|
||||
pkgSets, err := defs.PackageSets(t)
|
||||
pkgSets, err := t.ImageTypeYAML.PackageSets(t.arch.distro.Name(), t.arch.name)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue