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

deps: update images to v0.43.0

Browse source
This commit is contained in:
Achilleas Koutsou 2024-03-05 14:19:21 +01:00 • committed by Tomáš Hozza
parent 75d23d7c98
commit 525027726e
27 changed files with 547 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,7 +366,7 @@ var (
minimalrawImgType = imageType{
name: "minimal-raw",
filename: "raw.img.xz",
filename: "disk.raw.xz",
compression: "xz",
mimeType: "application/xz",
packageSets: map[string]packageSetFunc{
@ -397,7 +397,6 @@ type distribution struct {
releaseVersion string
modulePlatformID string
ostreeRefTmpl string
isolabelTmpl string
runner runner.Runner
arches map[string]distro.Arch
defaultImageConfig *distro.ImageConfig
@ -417,7 +416,6 @@ func getDistro(version int) distribution {
releaseVersion: strconv.Itoa(version),
modulePlatformID: fmt.Sprintf("platform:f%d", version),
ostreeRefTmpl: fmt.Sprintf("fedora/%d/%%s/iot", version),
isolabelTmpl: fmt.Sprintf("Fedora-%d-BaseOS-%%s", version),
runner: &runner.Fedora{Version: uint64(version)},
defaultImageConfig: defaultDistroImageConfig,
}

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

@ -22,6 +22,8 @@ import (
"github.com/osbuild/images/pkg/rpmmd"
)
const ISO_LABEL = "%s-%s-%s-%s"
// HELPERS
func osCustomizations(
@ -326,11 +328,12 @@ func liveInstallerImage(workload workload.Workload,
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.Product = d.product
img.OSName = "fedora"
img.Variant = "Workstation"
img.OSVersion = d.osVersion
img.Release = fmt.Sprintf("%s %s", d.product, d.osVersion)
img.ISOLabel = fmt.Sprintf(ISO_LABEL, img.Product, img.OSVersion, img.Variant, img.Platform.GetArch())
img.Filename = t.Filename()
@ -375,12 +378,19 @@ func imageInstallerImage(workload workload.Workload,
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.Product = d.product
// We don't know the variant that goes into the OS pipeline that gets installed
img.Variant = "Unknown"
img.OSName = "fedora"
img.OSVersion = d.osVersion
img.Release = fmt.Sprintf("%s %s", d.product, d.osVersion)
// We don't know the variant of the OS pipeline being installed
img.ISOLabel = fmt.Sprintf(ISO_LABEL, img.Product, img.OSVersion, img.Variant, img.Platform.GetArch())
img.Filename = t.Filename()
return img, nil
@ -537,13 +547,13 @@ func iotInstallerImage(workload workload.Workload,
img.SquashfsCompression = "lz4"
img.ISOLabelTempl = d.isolabelTmpl
img.Product = d.product
img.Variant = "IoT"
img.OSName = "fedora-iot"
img.Remote = "fedora-iot"
img.OSVersion = d.osVersion
img.Release = fmt.Sprintf("%s %s", d.product, d.osVersion)
img.ISOLabel = fmt.Sprintf(ISO_LABEL, img.Product, img.OSVersion, img.Variant, img.Platform.GetArch())
img.Filename = t.Filename()
@ -694,11 +704,11 @@ func iotSimplifiedInstallerImage(workload workload.Workload,
}
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.Product = d.product
img.Variant = "iot"
img.Variant = "IoT"
img.OSName = "fedora"
img.OSVersion = d.osVersion
img.ISOLabel = fmt.Sprintf(ISO_LABEL, img.Product, img.OSVersion, img.Variant, img.Platform.GetArch())
return img, nil
}

2
vendor/github.com/osbuild/images/pkg/distro/rhel8/edge.go generated vendored
View file

@ -147,7 +147,7 @@ func edgeSimplifiedInstallerImgType(rd distribution) imageType {
func minimalRawImgType(rd distribution) imageType {
it := imageType{
name: "minimal-raw",
filename: "raw.img.xz",
filename: "disk.raw.xz",
compression: "xz",
mimeType: "application/xz",
packageSets: map[string]packageSetFunc{

6
vendor/github.com/osbuild/images/pkg/distro/rhel8/images.go generated vendored
View file

@ -344,7 +344,7 @@ func imageInstallerImage(workload workload.Workload,
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.ISOLabelTmpl = d.isolabelTmpl
img.Product = d.product
img.OSName = "redhat"
img.OSVersion = d.osVersion
@ -461,7 +461,7 @@ func edgeInstallerImage(workload workload.Workload,
img.AdditionalAnacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
}
img.ISOLabelTempl = d.isolabelTmpl
img.ISOLabelTmpl = d.isolabelTmpl
img.Product = d.product
img.Variant = "edge"
img.OSName = "rhel"
@ -586,7 +586,7 @@ func edgeSimplifiedInstallerImage(workload workload.Workload,
}
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.ISOLabelTmpl = d.isolabelTmpl
img.Product = d.product
img.Variant = "edge"
img.OSName = "redhat"

2
vendor/github.com/osbuild/images/pkg/distro/rhel9/edge.go generated vendored
View file

@ -181,7 +181,7 @@ var (
minimalrawImgType = imageType{
name: "minimal-raw",
filename: "raw.img.xz",
filename: "disk.raw.xz",
compression: "xz",
mimeType: "application/xz",
packageSets: map[string]packageSetFunc{

6
vendor/github.com/osbuild/images/pkg/distro/rhel9/images.go generated vendored
View file

@ -414,7 +414,7 @@ func edgeInstallerImage(workload workload.Workload,
img.AdditionalAnacondaModules = []string{"org.fedoraproject.Anaconda.Modules.Users"}
}
img.ISOLabelTempl = d.isolabelTmpl
img.ISOLabelTmpl = d.isolabelTmpl
img.Product = d.product
img.Variant = "edge"
img.OSName = "rhel"
@ -571,7 +571,7 @@ func edgeSimplifiedInstallerImage(workload workload.Workload,
}
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.ISOLabelTmpl = d.isolabelTmpl
img.Product = d.product
img.Variant = "edge"
img.OSName = "redhat"
@ -618,7 +618,7 @@ func imageInstallerImage(workload workload.Workload,
d := t.arch.distro
img.ISOLabelTempl = d.isolabelTmpl
img.ISOLabelTmpl = d.isolabelTmpl
img.Product = d.product
img.OSName = "redhat"
img.OSVersion = d.osVersion