ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Use new ovmf firmware packages.

Browse source 
* doc/guix.texi (Invoking guix system): Update qemu command to use
ovmf-x86-64.
* gnu/packages/virtualization.scm (xen)[inputs]: Replace ovmf with
ovmf-i686.
* gnu/tests/install.scm (uefi-firmware): Use system appropriate ovmf
firmware.

Change-Id: Ia2ff76eaf766c8d4fb0be4a7cc7b8941574433d0
This commit is contained in:
Efraim Flashner 2024-04-30 16:47:57 +03:00
parent 5013d0286e
commit c0610dfb1a
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -42580,7 +42580,7 @@ image=$(guix system image --image-type=qcow2 \
cp $image /tmp/my-image.qcow2 cp $image /tmp/my-image.qcow2
chmod +w /tmp/my-image.qcow2 chmod +w /tmp/my-image.qcow2
qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \ qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \
-bios $(guix build ovmf)/share/firmware/ovmf_x64.bin -bios $(guix build ovmf-x86-64)/share/firmware/ovmf_x64.bin
@end example @end example
When using the @code{mbr-hybrid-raw} image type, a raw disk image is When using the @code{mbr-hybrid-raw} image type, a raw disk image is

2
gnu/packages/virtualization.scm
View file

@ -2670,7 +2670,7 @@ (define (filter-environment! filter-predicate
yajl yajl
ncurses ncurses
openssl openssl
ovmf ovmf-i686
pixman pixman
qemu-minimal qemu-minimal
seabios seabios

4
gnu/tests/install.scm
View file

@ -210,9 +210,9 @@ (define (uefi-firmware system)
"Return the appropriate QEMU OVMF UEFI firmware for the given SYSTEM." "Return the appropriate QEMU OVMF UEFI firmware for the given SYSTEM."
(cond (cond
((string-prefix? "x86_64" system) ((string-prefix? "x86_64" system)
(file-append ovmf "/share/firmware/ovmf_x64.bin")) (file-append ovmf-x86-64 "/share/firmware/ovmf_x64.bin"))
((string-prefix? "i686" system) ((string-prefix? "i686" system)
(file-append ovmf "/share/firmware/ovmf_ia32.bin")) (file-append ovmf-i686 "/share/firmware/ovmf_ia32.bin"))
(else #f))) (else #f)))
(define* (run-install target-os target-os-source (define* (run-install target-os target-os-source