platform: add the aarch64_iot platform

This platform copies more files into `/boot` which are necessary to be
able to boot IoT on some single board computers.

We also immediately set this on the `Aarch64_IoT` platform which needs
u-boot to be placed in the `/boot`.

This closes #3312.

internal/distro/fedora/distro.go

@@ -1025,11 +1025,43 @@ func newDistro(version int) distro.Distro {
 		imageInstallerImgType,
 	)
 	aarch64.addImageTypes(
-		&platform.Aarch64{
+		&platform.Aarch64_IoT{
 			BasePlatform: platform.BasePlatform{
 				ImageFormat: platform.FORMAT_RAW,
 			},
 			UEFIVendor: "fedora",
+			BootFiles: [][2]string{
+				{"/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/bootcode.bin", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/config.txt", "/boot/efi/config.txt"},
+				{"/usr/lib/ostree-boot/efi/fixup.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup4.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup4cd.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup4db.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup4x.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup_cd.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup_db.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/fixup_x.dat", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/overlays", "/boot/efi/"},
+				{"/usr/share/uboot/rpi_arm64/u-boot.bin", "/boot/efi/rpi-u-boot.bin"},
+				{"/usr/lib/ostree-boot/efi/start.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start4.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start4cd.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start4db.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start4x.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start_cd.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start_db.elf", "/boot/efi/"},
+				{"/usr/lib/ostree-boot/efi/start_x.elf", "/boot/efi/"},
+			},
 		},
 		iotRawImgType,
 	)

internal/manifest/raw_ostree.go

@@ -1,6 +1,8 @@
 package manifest
 
 import (
+	"fmt"
+
 	"github.com/osbuild/osbuild-composer/internal/artifact"
 	"github.com/osbuild/osbuild-composer/internal/osbuild"
 	"github.com/osbuild/osbuild-composer/internal/platform"
@@ -61,7 +63,24 @@ func (p *RawOSTreeImage) serialize() osbuild.Pipeline {
 
 	inputName := "root-tree"
 	copyOptions, copyDevices, copyMounts := osbuild.GenCopyFSTreeOptions(inputName, p.treePipeline.Name(), p.Filename, pt)
-	copyInputs := osbuild.NewPipelineTreeInputs(inputName, p.treePipeline.Name())
+
+	commitChecksum := p.treePipeline.commit.Checksum
+
+	treeInputs := osbuild.NewPipelineTreeInputs(inputName, p.treePipeline.Name())
+	copyInputs := *treeInputs
+
+	bootFiles := p.platform.GetBootFiles()
+	if len(bootFiles) > 0 {
+		for _, paths := range bootFiles {
+			copyOptions.Paths = append(copyOptions.Paths, osbuild.CopyStagePath{
+				From: fmt.Sprintf("input://ostree-tree/%s/%s", commitChecksum, paths[0]),
+				To:   fmt.Sprintf("mount://root/%s", paths[1]),
+			})
+		}
+
+		copyInputs["ostree-tree"] = osbuild.NewOSTreeCheckoutInput("org.osbuild.source", commitChecksum)
+	}
+
 	pipeline.AddStage(osbuild.NewCopyStage(copyOptions, copyInputs, copyDevices, copyMounts))
 
 	for _, stage := range osbuild.GenImageFinishStages(pt, p.Filename) {

internal/osbuild/ostree_input.go

@@ -20,7 +20,7 @@ type OSTreeCheckoutInput struct {
 	References OSTreeCheckoutReferences `json:"references"`
 }
 
-func (OSTreeCheckoutInput) isStageInput() {}
+func (OSTreeCheckoutInput) isInput() {}
 
 type OSTreeCheckoutReferences []string
 

internal/osbuild/tree_input.go

@@ -19,7 +19,7 @@ func NewTreeInput(reference string) *TreeInput {
 	return input
 }
 
-type PipelineTreeInputs map[string]TreeInput
+type PipelineTreeInputs map[string]Input
 
 func NewPipelineTreeInputs(name, pipeline string) *PipelineTreeInputs {
 	return &PipelineTreeInputs{

internal/platform/aarch64.go

@@ -27,3 +27,36 @@ func (p *Aarch64) GetPackages() []string {
 
 	return packages
 }
+
+type Aarch64_IoT struct {
+	BasePlatform
+	UEFIVendor string
+	BootFiles  [][2]string
+}
+
+func (p *Aarch64_IoT) GetArch() Arch {
+	return ARCH_AARCH64
+}
+
+func (p *Aarch64_IoT) GetUEFIVendor() string {
+	return p.UEFIVendor
+}
+
+func (p *Aarch64_IoT) GetPackages() []string {
+	packages := p.BasePlatform.FirmwarePackages
+
+	if p.UEFIVendor != "" {
+		packages = append(packages,
+			"dracut-config-generic",
+			"efibootmgr",
+			"grub2-efi-aa64",
+			"grub2-tools",
+			"shim-aa64")
+	}
+
+	return packages
+}
+
+func (p *Aarch64_IoT) GetBootFiles() [][2]string {
+	return p.BootFiles
+}

internal/platform/platform.go

@@ -63,6 +63,7 @@ type Platform interface {
 	GetZiplSupport() bool
 	GetPackages() []string
 	GetBuildPackages() []string
+	GetBootFiles() [][2]string
 }
 
 type BasePlatform struct {
@@ -98,3 +99,7 @@ func (p BasePlatform) GetPackages() []string {
 func (p BasePlatform) GetBuildPackages() []string {
 	return []string{}
 }
+
+func (p BasePlatform) GetBootFiles() [][2]string {
+	return [][2]string{}
+}

test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json

@@ -2376,6 +2376,13 @@
           {
             "type": "org.osbuild.copy",
             "inputs": {
+              "ostree-tree": {
+                "type": "org.osbuild.ostree.checkout",
+                "origin": "org.osbuild.source",
+                "references": [
+                  ""
+                ]
+              },
               "root-tree": {
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
@@ -2389,6 +2396,126 @@
                 {
                   "from": "input://root-tree/",
                   "to": "mount://root/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bootcode.bin",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/config.txt",
+                  "to": "mount://root//boot/efi/config.txt"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/overlays",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/share/uboot/rpi_arm64/u-boot.bin",
+                  "to": "mount://root//boot/efi/rpi-u-boot.bin"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4x.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
+                  "to": "mount://root//boot/efi/"
                 }
               ]
             },

test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json

@@ -2392,6 +2392,13 @@
           {
             "type": "org.osbuild.copy",
             "inputs": {
+              "ostree-tree": {
+                "type": "org.osbuild.ostree.checkout",
+                "origin": "org.osbuild.source",
+                "references": [
+                  ""
+                ]
+              },
               "root-tree": {
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
@@ -2405,6 +2412,126 @@
                 {
                   "from": "input://root-tree/",
                   "to": "mount://root/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bootcode.bin",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/config.txt",
+                  "to": "mount://root//boot/efi/config.txt"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/overlays",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/share/uboot/rpi_arm64/u-boot.bin",
+                  "to": "mount://root//boot/efi/rpi-u-boot.bin"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4x.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
+                  "to": "mount://root//boot/efi/"
                 }
               ]
             },

test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json

@@ -2207,6 +2207,13 @@
           {
             "type": "org.osbuild.copy",
             "inputs": {
+              "ostree-tree": {
+                "type": "org.osbuild.ostree.checkout",
+                "origin": "org.osbuild.source",
+                "references": [
+                  ""
+                ]
+              },
               "root-tree": {
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
@@ -2220,6 +2227,126 @@
                 {
                   "from": "input://root-tree/",
                   "to": "mount://root/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bootcode.bin",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/config.txt",
+                  "to": "mount://root//boot/efi/config.txt"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/overlays",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/share/uboot/rpi_arm64/u-boot.bin",
+                  "to": "mount://root//boot/efi/rpi-u-boot.bin"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4x.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
+                  "to": "mount://root//boot/efi/"
                 }
               ]
             },

test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json

@@ -2223,6 +2223,13 @@
           {
             "type": "org.osbuild.copy",
             "inputs": {
+              "ostree-tree": {
+                "type": "org.osbuild.ostree.checkout",
+                "origin": "org.osbuild.source",
+                "references": [
+                  ""
+                ]
+              },
               "root-tree": {
                 "type": "org.osbuild.tree",
                 "origin": "org.osbuild.pipeline",
@@ -2236,6 +2243,126 @@
                 {
                   "from": "input://root-tree/",
                   "to": "mount://root/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/bootcode.bin",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/config.txt",
+                  "to": "mount://root//boot/efi/config.txt"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup4x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_cd.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_db.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/fixup_x.dat",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/overlays",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/share/uboot/rpi_arm64/u-boot.bin",
+                  "to": "mount://root//boot/efi/rpi-u-boot.bin"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start4x.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_cd.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_db.elf",
+                  "to": "mount://root//boot/efi/"
+                },
+                {
+                  "from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
+                  "to": "mount://root//boot/efi/"
                 }
               ]
             },