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

manifest/os: make ostree parameters optional

Browse source 
The OSTree parameters can be set after initialisation. We should only require parameters
to be set at initialisation time if we have no good defaults. In the case of OSTree the
default is to not enable OSTree support.
This commit is contained in:
Tom Gundersen 2022-07-04 22:34:59 +01:00 • committed by Achilleas Koutsou
parent b0b5a48c5f
commit 64b4ad7c31
4 changed files with 43 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/manifest/commit.go
View file

@ -43,6 +43,10 @@ func (p *OSTreeCommitPipeline) getBuildPackages() []string {
func (p *OSTreeCommitPipeline) serialize() osbuild2.Pipeline {
pipeline := p.BasePipeline.serialize()
if p.treePipeline.OSTree == nil {
panic("tree is not ostree")
}
pipeline.AddStage(osbuild2.NewOSTreeInitStage(&osbuild2.OSTreeInitStageOptions{Path: "/repo"}))
commitStageInput := new(osbuild2.OSTreeCommitStageInput)
@ -50,11 +54,15 @@ func (p *OSTreeCommitPipeline) serialize() osbuild2.Pipeline {
commitStageInput.Origin = "org.osbuild.pipeline"
commitStageInput.References = osbuild2.OSTreeCommitStageReferences{"name:" + p.treePipeline.Name()}
var parent string
if p.treePipeline.OSTree.Parent != nil {
parent = p.treePipeline.OSTree.Parent.Checksum
}
pipeline.AddStage(osbuild2.NewOSTreeCommitStage(
&osbuild2.OSTreeCommitStageOptions{
Ref: p.ref,
OSVersion: p.OSVersion,
Parent: p.treePipeline.osTreeParent,
Parent: parent,
},
&osbuild2.OSTreeCommitStageInputs{Tree: commitStageInput}),
)