summaryrefslogtreecommitdiff
path: root/gnu/packages/virtualization.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-12-22 13:50:30 +0100
committerMarius Bakke <marius@gnu.org>2022-12-22 16:50:47 +0100
commit209aed9511f41b2bfabe32d2e280192e64e3d54b (patch)
tree34cd3bfce5d96cf2354fcb08dedb72d5ee644c6b /gnu/packages/virtualization.scm
parentba7f6f0bf3922968d16ad433da818928381e1578 (diff)
gnu: Install QEMU firmare files to 'share/qemu'.
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.
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r--gnu/packages/virtualization.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5c832beb9f..9f1db849a3 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -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