guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: Install QEMU firmare files to 'share/qemu'.

Browse source 
This paves the way for using a native search path in the future.

* gnu/packages/bootloaders.scm (ipxe-qemu)[arguments]: Install firmware files
to 'share/qemu' instead of 'share/firmware'.
* gnu/packages/firmware.scm (seabios-qemu)[arguments]: Likewise.
* gnu/packages/virtualization.scm (qemu)[arguments]: Adjust accordingly.
This commit is contained in:
Marius Bakke 2022-12-22 13:50:30 +01:00
parent ba7f6f0bf3
commit 209aed9511
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/bootloaders.scm
View file

@ -1577,7 +1577,7 @@ the features of iPXE without the hassle of reflashing.")
#~(modify-phases #$phases
(replace 'install
(lambda _
(let ((firmware (string-append #$output "/share/firmware")))
(let ((firmware (string-append #$output "/share/qemu")))
(mkdir-p firmware)
(for-each
(match-lambda

2
gnu/packages/firmware.scm
View file

@ -560,7 +560,7 @@ coreboot.")
vgabiosen))))))
(replace 'install
(lambda _
(let ((firmware (string-append #$output "/share/firmware")))
(let ((firmware (string-append #$output "/share/qemu")))
(for-each (lambda (bios)
(install-file bios firmware))
(find-files "out" "\\.bin$"))

8
gnu/packages/virtualization.scm
View file

@ -198,9 +198,9 @@
#~(let ((gcc (search-input-file %build-inputs "/bin/gcc"))
(meson (search-input-file %build-inputs "bin/meson"))
(seabios (search-input-file %build-inputs
"share/firmware/bios.bin"))
"share/qemu/bios.bin"))
(ipxe (search-input-file %build-inputs
"share/firmware/pxe-virtio.rom"))
"share/qemu/pxe-virtio.rom"))
(out #$output))
(list (string-append "--cc=" gcc)
;; Some architectures insist on using HOST_CC.
@ -231,10 +231,10 @@
(add-after 'unpack 'replace-firmwares
(lambda* (#:key inputs #:allow-other-keys)
(let* ((seabios (dirname (search-input-file
inputs "share/firmware/bios.bin")))
inputs "share/qemu/bios.bin")))
(seabios-firmwares (find-files seabios "\\.bin$"))
(ipxe (dirname (search-input-file
inputs "share/firmware/pxe-virtio.rom")))
inputs "share/qemu/pxe-virtio.rom")))
(ipxe-firmwares (find-files ipxe "\\.rom$"))
(allowed-differences
;; Ignore minor differences (addresses etc) in the firmware