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

osbuild: introduce bootloader struct into qemu assembler

Browse source 
osbuild takes a "bootloader" object as an option to the qemu assembler:
3f14ace5c1/assemblers/org.osbuild.qemu (L43)
we don't use it because for x86_64 with enabled legacy support it
defaults to the right value:
3f14ace5c1/assemblers/org.osbuild.qemu (L482)
but in order to gain support for ppc64le we need to introduce this.
Example usage can be found in samples directory:
3f14ace5c1/samples/f30-ppc64le.json (L819)

This change itself does not alter osbuild-composer output.
This commit is contained in:
Martin Sehnoutka 2020-06-04 09:36:48 +02:00 • committed by Ondřej Budai
parent 0f5b99c754
commit 604f7c2a55
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/osbuild/qemu_assembler.go
View file

@ -9,6 +9,7 @@ import "github.com/google/uuid"
// containing the indicated partitions. Finally, the image is converted into // containing the indicated partitions. Finally, the image is converted into
// the target format and stored with the given filename. // the target format and stored with the given filename.
type QEMUAssemblerOptions struct { type QEMUAssemblerOptions struct {
Bootloader *QEMUBootloader `json:"bootloader,omitempty"`
Format string `json:"format"` Format string `json:"format"`
Filename string `json:"filename"` Filename string `json:"filename"`
Size uint64 `json:"size"` Size uint64 `json:"size"`
@ -33,6 +34,11 @@ type QEMUFilesystem struct {
Mountpoint string `json:"mountpoint"` Mountpoint string `json:"mountpoint"`
} }
type QEMUBootloader struct {
Type string `json:"type"`
Platform string `json:"platform"`
}
func (QEMUAssemblerOptions) isAssemblerOptions() {} func (QEMUAssemblerOptions) isAssemblerOptions() {}
// NewQEMUAssembler creates a new QEMU Assembler object. // NewQEMUAssembler creates a new QEMU Assembler object.