manifest: copy boot files from build

When the `FromBuild` property is set on a `BootFile` the source pipeline
is the build pipeline; instead of the root tree.

This allows us to have certain firmware packages to only be in the build
pipeline instead of having to be installed in the root tree.

This *also* allows us to omit the problematic `efi-srpm-macros` package
which is depended upon by same firmware packages that want to write
directly into the ESP.

This is problematic because the ESP path is defined by `efi-srpm-macros`
at build time; and can be different from what it is in our partition
tables or customizations.

The caveat is that without these packages installed in the root tree
they also won't receive updates. This is, I guess, a necessary evil
until this can be addressed in Fedora itself.

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

Author: supakeen

pkg/manifest/raw.go

@@ -69,10 +69,20 @@ func (p *RawImage) serialize() (osbuild.Pipeline, error) {
 	copyInputs := osbuild.NewPipelineTreeInputs(inputName, p.treePipeline.Name())
 	pipeline.AddStage(osbuild.NewCopyStage(copyOptions, copyInputs, copyDevices, copyMounts))
 
-	bootFiles := p.treePipeline.platform.GetBootFiles()
-	if len(bootFiles) > 0 {
-		bootCopyInputs := osbuild.NewPipelineTreeInputs(inputName, p.treePipeline.Name())
-		stage, err := bootFilesCopyStage(bootFiles, bootCopyInputs, inputName, inputName, p.treePipeline.Name(), p.Filename(), pt)
+	treeBootFiles, buildBootFiles := splitBootFiles(p.treePipeline.platform.GetBootFiles())
+	if len(treeBootFiles) > 0 {
+		treeInputName := "root-tree"
+		bootCopyInputs := osbuild.NewPipelineTreeInputs(treeInputName, p.treePipeline.Name())
+		stage, err := bootFilesCopyStage(treeBootFiles, bootCopyInputs, treeInputName, p.Filename(), pt)
+		if err != nil {
+			return osbuild.Pipeline{}, err
+		}
+		pipeline.AddStage(stage)
+	}
+	if len(buildBootFiles) > 0 {
+		buildInputName := "build-tree"
+		buildCopyInputs := osbuild.NewPipelineTreeInputs(buildInputName, p.build.Name())
+		stage, err := bootFilesCopyStage(buildBootFiles, buildCopyInputs, buildInputName, p.Filename(), pt)
 		if err != nil {
 			return osbuild.Pipeline{}, err
 		}
@@ -117,13 +127,24 @@ func (p *RawImage) serialize() (osbuild.Pipeline, error) {
 	return pipeline, nil
 }
 
+func splitBootFiles(bootFiles []platform.BootFile) (tree, build []platform.BootFile) {
+	for _, bf := range bootFiles {
+		if bf.FromBuild {
+			build = append(build, bf)
+		} else {
+			tree = append(tree, bf)
+		}
+	}
+	return tree, build
+}
+
 func bootFilesCopyStage(
 	bootFiles []platform.BootFile,
 	inputs osbuild.Inputs,
-	srcPrefix, inputName, pipelineName, filename string,
+	srcPrefix, filename string,
 	pt *disk.PartitionTable,
 ) (*osbuild.Stage, error) {
-	_, devices, mounts := osbuild.GenCopyFSTreeOptions(inputName, pipelineName, filename, pt)
+	_, devices, mounts := osbuild.GenCopyFSTreeOptions("", "", filename, pt)
 
 	var fsRootMntName string
 	for _, mnt := range mounts {

pkg/manifest/raw_ostree.go

@@ -71,15 +71,24 @@ func (p *RawOSTreeImage) serialize() (osbuild.Pipeline, error) {
 
 	pipeline.AddStage(osbuild.NewCopyStage(treeCopyOptions, treeCopyInputs, treeCopyDevices, treeCopyMounts))
 
-	bootFiles := p.platform.GetBootFiles()
-	if len(bootFiles) > 0 {
+	treeBootFiles, buildBootFiles := splitBootFiles(p.platform.GetBootFiles())
+	if len(treeBootFiles) > 0 {
 		commit := p.treePipeline.ostreeSpec
 		commitChecksum := commit.Checksum
 		bootCopyInputs := osbuild.OSTreeCheckoutInputs{
 			"ostree-tree": *osbuild.NewOSTreeCheckoutInput("org.osbuild.source", commitChecksum),
 		}
 		srcPrefix := fmt.Sprintf("ostree-tree/%s", commitChecksum)
-		stage, err := bootFilesCopyStage(bootFiles, bootCopyInputs, srcPrefix, inputName, p.treePipeline.Name(), p.Filename(), pt)
+		stage, err := bootFilesCopyStage(treeBootFiles, bootCopyInputs, srcPrefix, p.Filename(), pt)
+		if err != nil {
+			return osbuild.Pipeline{}, err
+		}
+		pipeline.AddStage(stage)
+	}
+	if len(buildBootFiles) > 0 {
+		buildInputName := "build-tree"
+		buildCopyInputs := osbuild.NewPipelineTreeInputs(buildInputName, p.build.Name())
+		stage, err := bootFilesCopyStage(buildBootFiles, buildCopyInputs, buildInputName, p.Filename(), pt)
 		if err != nil {
 			return osbuild.Pipeline{}, err
 		}

pkg/platform/platform.go

@@ -150,8 +150,9 @@ func (f *ImageFormat) UnmarshalYAML(unmarshal func(any) error) error {
 }
 
 type BootFile struct {
-	Src string `yaml:"src" json:"src"`
-	Dst string `yaml:"dst" json:"dst"`
+	Src       string `yaml:"src" json:"src"`
+	Dst       string `yaml:"dst" json:"dst"`
+	FromBuild bool   `yaml:"from_build,omitempty" json:"from_build,omitempty"`
 }
 
 type Platform interface {