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

25
vendor/github.com/osbuild/images/pkg/image/anaconda_container_installer.go generated vendored
View file

@ -25,13 +25,14 @@ type AnacondaContainerInstaller struct {
SquashfsCompression string
ISOLabelTempl string
Product string
Variant string
OSName string
Ref string
OSVersion string
Release string
ISOLabel string
ISOLabelTmpl string
Product string
Variant string
OSName string
Ref string
OSVersion string
Release string
ContainerSource container.SourceSpec
@ -89,8 +90,14 @@ func (img *AnacondaContainerInstaller) InstantiateManifest(m *manifest.Manifest,
}
anacondaPipeline.AdditionalDrivers = img.AdditionalDrivers
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel := fmt.Sprintf(img.ISOLabelTempl, img.Platform.GetArch())
var isoLabel string
if len(img.ISOLabel) > 0 {
isoLabel = img.ISOLabel
} else {
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel = fmt.Sprintf(img.ISOLabelTmpl, img.Platform.GetArch())
}
rootfsImagePipeline := manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 4 * common.GibiByte

23
vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go generated vendored
View file

@ -23,12 +23,13 @@ type AnacondaLiveInstaller struct {
ExtraBasePackages rpmmd.PackageSet
ISOLabelTempl string
Product string
Variant string
OSName string
OSVersion string
Release string
ISOLabel string
ISOLabelTmpl string
Product string
Variant string
OSName string
OSVersion string
Release string
Filename string
@ -66,8 +67,14 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
livePipeline.Checkpoint()
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel := fmt.Sprintf(img.ISOLabelTempl, img.Platform.GetArch())
var isoLabel string
if len(img.ISOLabel) > 0 {
isoLabel = img.ISOLabel
} else {
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel = fmt.Sprintf(img.ISOLabelTmpl, img.Platform.GetArch())
}
rootfsImagePipeline := manifest.NewISORootfsImg(buildPipeline, livePipeline)
rootfsImagePipeline.Size = 8 * common.GibiByte

25
vendor/github.com/osbuild/images/pkg/image/anaconda_ostree_installer.go generated vendored
View file

@ -35,13 +35,14 @@ type AnacondaOSTreeInstaller struct {
SquashfsCompression string
ISOLabelTempl string
Product string
Variant string
OSName string
OSVersion string
Release string
Remote string
ISOLabel string
ISOLabelTmpl string
Product string
Variant string
OSName string
OSVersion string
Release string
Remote string
Commit ostree.SourceSpec
@ -94,8 +95,14 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
}
anacondaPipeline.AdditionalDrivers = img.AdditionalDrivers
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel := fmt.Sprintf(img.ISOLabelTempl, img.Platform.GetArch())
var isoLabel string
if len(img.ISOLabel) > 0 {
isoLabel = img.ISOLabel
} else {
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel = fmt.Sprintf(img.ISOLabelTmpl, img.Platform.GetArch())
}
rootfsImagePipeline := manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 4 * common.GibiByte

23
vendor/github.com/osbuild/images/pkg/image/anaconda_tar_installer.go generated vendored
View file

@ -66,12 +66,13 @@ type AnacondaTarInstaller struct {
SquashfsCompression string
ISOLabelTempl string
Product string
Variant string
OSName string
OSVersion string
Release string
ISOLabel string
ISOLabelTmpl string
Product string
Variant string
OSName string
OSVersion string
Release string
Filename string
@ -136,8 +137,14 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
anacondaPipeline.Checkpoint()
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel := fmt.Sprintf(img.ISOLabelTempl, img.Platform.GetArch())
var isoLabel string
if len(img.ISOLabel) > 0 {
isoLabel = img.ISOLabel
} else {
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel = fmt.Sprintf(img.ISOLabelTmpl, img.Platform.GetArch())
}
rootfsImagePipeline := manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 5 * common.GibiByte

13
vendor/github.com/osbuild/images/pkg/image/ostree_simplified_installer.go generated vendored
View file

@ -29,8 +29,10 @@ type OSTreeSimplifiedInstaller struct {
ExtraBasePackages rpmmd.PackageSet
ISOLabel string
// ISO label template (architecture-free)
ISOLabelTempl string
ISOLabelTmpl string
// Product string for ISO buildstamp
Product string
@ -97,7 +99,14 @@ func (img *OSTreeSimplifiedInstaller) InstantiateManifest(m *manifest.Manifest,
coiPipeline.Variant = img.Variant
coiPipeline.AdditionalDracutModules = img.AdditionalDracutModules
isoLabel := fmt.Sprintf(img.ISOLabelTempl, img.Platform.GetArch())
var isoLabel string
if len(img.ISOLabel) > 0 {
isoLabel = img.ISOLabel
} else {
// TODO: replace isoLabelTmpl with more high-level properties
isoLabel = fmt.Sprintf(img.ISOLabelTmpl, img.Platform.GetArch())
}
bootTreePipeline := manifest.NewEFIBootTree(buildPipeline, img.Product, img.OSVersion)
bootTreePipeline.Platform = img.Platform