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

iot: change the copy stages

Browse source 
Split this into two separate copystages so that we are not overriding
types.
This commit is contained in:
Simon de Vlieger 2023-04-18 14:02:35 +02:00
parent b0fce3bfd1
commit 258f450021
7 changed files with 520 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

29
internal/manifest/raw_ostree.go
View file

@ -62,27 +62,34 @@ func (p *RawOSTreeImage) serialize() osbuild.Pipeline {
}
inputName := "root-tree"
copyOptions, copyDevices, copyMounts := osbuild.GenCopyFSTreeOptions(inputName, p.treePipeline.Name(), p.Filename, pt)
treeCopyOptions, treeCopyDevices, treeCopyMounts := osbuild.GenCopyFSTreeOptions(inputName, p.treePipeline.Name(), p.Filename, pt)
treeCopyInputs := osbuild.NewPipelineTreeInputs(inputName, p.treePipeline.Name())
commitChecksum := p.treePipeline.commit.Checksum
treeInputs := osbuild.NewPipelineTreeInputs(inputName, p.treePipeline.Name())
copyInputs := *treeInputs
pipeline.AddStage(osbuild.NewCopyStage(treeCopyOptions, treeCopyInputs, treeCopyDevices, treeCopyMounts))
bootFiles := p.platform.GetBootFiles()
if len(bootFiles) > 0 {
// we ignore the bootcopyoptions as they contain a full tree copy instead we make our own, we *do* still want all the other
// information such as mountpoints and devices
_, bootCopyDevices, bootCopyMounts := osbuild.GenCopyFSTreeOptions(inputName, p.treePipeline.Name(), p.Filename, pt)
bootCopyOptions := &osbuild.CopyStageOptions{}
commitChecksum := p.treePipeline.commit.Checksum
bootCopyInputs := osbuild.OSTreeCheckoutInputs{
"ostree-tree": *osbuild.NewOSTreeCheckoutInput("org.osbuild.source", commitChecksum),
}
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]),
bootCopyOptions.Paths = append(bootCopyOptions.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(bootCopyOptions, bootCopyInputs, bootCopyDevices, bootCopyMounts))
}
pipeline.AddStage(osbuild.NewCopyStage(copyOptions, copyInputs, copyDevices, copyMounts))
for _, stage := range osbuild.GenImageFinishStages(pt, p.Filename) {
pipeline.AddStage(stage)
}

8
internal/osbuild/ostree_input.go
View file

@ -5,7 +5,7 @@ type OSTreeInput struct {
inputCommon
}
func (OSTreeInput) isInput() {}
func (OSTreeInput) isStageInputs() {}
func NewOSTreeInput() *OSTreeInput {
input := new(OSTreeInput)
@ -20,8 +20,6 @@ type OSTreeCheckoutInput struct {
References OSTreeCheckoutReferences `json:"references"`
}
func (OSTreeCheckoutInput) isInput() {}
type OSTreeCheckoutReferences []string
func (OSTreeCheckoutReferences) isReferences() {}
@ -40,3 +38,7 @@ func NewOSTreeCheckoutInput(origin, name string) *OSTreeCheckoutInput {
input.References = inputRefs
return input
}
type OSTreeCheckoutInputs map[string]OSTreeCheckoutInput
func (c OSTreeCheckoutInputs) isStageInputs() {}

2
internal/osbuild/tree_input.go
View file

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

193
test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
View file

@ -2376,13 +2376,6 @@
{
"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",
@ -2396,126 +2389,188 @@
{
"from": "input://root-tree/",
"to": "mount://root/"
}
]
},
"devices": {
"boot": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 1028096,
"size": 2097152
}
},
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 2048,
"size": 1026048
}
},
"root": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 3125248,
"size": 5263360
}
}
},
"mounts": [
{
"name": "root",
"type": "org.osbuild.ext4",
"source": "root",
"target": "/"
},
{
"name": "boot",
"type": "org.osbuild.ext4",
"source": "boot",
"target": "/boot"
},
{
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "boot.efi",
"target": "/boot/efi"
}
]
},
{
"type": "org.osbuild.copy",
"inputs": {
"ostree-tree": {
"type": "org.osbuild.ostree.checkout",
"origin": "org.osbuild.source",
"references": [
""
]
}
},
"options": {
"paths": [
{
"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-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-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-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-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-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/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-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-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-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/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/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/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/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/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/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/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/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_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_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/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/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/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/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/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/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/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/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_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_db.elf",
"to": "mount://root//boot/efi/"
},
{
"from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root//boot/efi/"
"from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root/boot/efi/"
}
]
},

193
test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
View file

@ -2392,13 +2392,6 @@
{
"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",
@ -2412,126 +2405,188 @@
{
"from": "input://root-tree/",
"to": "mount://root/"
}
]
},
"devices": {
"boot": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 1028096,
"size": 2097152
}
},
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 2048,
"size": 1026048
}
},
"root": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 3125248,
"size": 5263360
}
}
},
"mounts": [
{
"name": "root",
"type": "org.osbuild.ext4",
"source": "root",
"target": "/"
},
{
"name": "boot",
"type": "org.osbuild.ext4",
"source": "boot",
"target": "/boot"
},
{
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "boot.efi",
"target": "/boot/efi"
}
]
},
{
"type": "org.osbuild.copy",
"inputs": {
"ostree-tree": {
"type": "org.osbuild.ostree.checkout",
"origin": "org.osbuild.source",
"references": [
""
]
}
},
"options": {
"paths": [
{
"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-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-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-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-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-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/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-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-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-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/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/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/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/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/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/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/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/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_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_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/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/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/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/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/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/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/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/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_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_db.elf",
"to": "mount://root//boot/efi/"
},
{
"from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root//boot/efi/"
"from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root/boot/efi/"
}
]
},

193
test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
View file

@ -2207,13 +2207,6 @@
{
"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",
@ -2227,126 +2220,188 @@
{
"from": "input://root-tree/",
"to": "mount://root/"
}
]
},
"devices": {
"boot": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 1028096,
"size": 2097152
}
},
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 2048,
"size": 1026048
}
},
"root": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 3125248,
"size": 5263360
}
}
},
"mounts": [
{
"name": "root",
"type": "org.osbuild.ext4",
"source": "root",
"target": "/"
},
{
"name": "boot",
"type": "org.osbuild.ext4",
"source": "boot",
"target": "/boot"
},
{
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "boot.efi",
"target": "/boot/efi"
}
]
},
{
"type": "org.osbuild.copy",
"inputs": {
"ostree-tree": {
"type": "org.osbuild.ostree.checkout",
"origin": "org.osbuild.source",
"references": [
""
]
}
},
"options": {
"paths": [
{
"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-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-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-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-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-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/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-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-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-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/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/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/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/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/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/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/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/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_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_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/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/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/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/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/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/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/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/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_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_db.elf",
"to": "mount://root//boot/efi/"
},
{
"from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root//boot/efi/"
"from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root/boot/efi/"
}
]
},

193
test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json
View file

@ -2223,13 +2223,6 @@
{
"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",
@ -2243,126 +2236,188 @@
{
"from": "input://root-tree/",
"to": "mount://root/"
}
]
},
"devices": {
"boot": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 1028096,
"size": 2097152
}
},
"boot.efi": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 2048,
"size": 1026048
}
},
"root": {
"type": "org.osbuild.loopback",
"options": {
"filename": "disk.img",
"start": 3125248,
"size": 5263360
}
}
},
"mounts": [
{
"name": "root",
"type": "org.osbuild.ext4",
"source": "root",
"target": "/"
},
{
"name": "boot",
"type": "org.osbuild.ext4",
"source": "boot",
"target": "/boot"
},
{
"name": "boot.efi",
"type": "org.osbuild.fat",
"source": "boot.efi",
"target": "/boot/efi"
}
]
},
{
"type": "org.osbuild.copy",
"inputs": {
"ostree-tree": {
"type": "org.osbuild.ostree.checkout",
"origin": "org.osbuild.source",
"references": [
""
]
}
},
"options": {
"paths": [
{
"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-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-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-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-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-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/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-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-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-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/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/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/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/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/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/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/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/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_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_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/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/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/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/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/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/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/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/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_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_db.elf",
"to": "mount://root//boot/efi/"
},
{
"from": "input://ostree-tree///usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root//boot/efi/"
"from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf",
"to": "mount://root/boot/efi/"
}
]
},