about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/OVMF
diff options
context:
space:
mode:
authorDaniel Fullmer <danielrf12@gmail.com>2020-06-13 23:35:36 -0400
committerDaniel Fullmer <danielrf12@gmail.com>2020-07-06 12:07:50 -0700
commit90bf7332e119b1049c7c1c388fab89c5d3154c69 (patch)
tree174294d0cfaf52e801409a9fac0ab5e0b832c6b6 /pkgs/applications/virtualization/OVMF
parentb278a7d75ae96d1416791da99b778eb46018a9b2 (diff)
OVMF: use Debian dir layout for aarch64
Diffstat (limited to 'pkgs/applications/virtualization/OVMF')
-rw-r--r--pkgs/applications/virtualization/OVMF/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 19ba8ced49731..9ce9a22381b0b 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -38,14 +38,13 @@ edk2.mkDerivation projectDscPath {
 
   postFixup = if stdenv.isAarch64 then ''
     mkdir -vp $fd/FV
-    mkdir -vp $fd/AAVMF
     mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
 
-    # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
-    # FIXME: why is it different from Debian dir layout? https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules
-    dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=/dev/zero bs=1M    count=64
-    dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=$fd/FV/QEMU_EFI.fd conv=notrunc
-    dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M    count=64
+    # Use Debian dir layout: https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules
+    # Note that Fedora dir layout is different: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
+    dd of=$fd/FV/AAVMF_CODE.fd  if=/dev/zero bs=1M    count=64
+    dd of=$fd/FV/AAVMF_CODE.fd  if=$fd/FV/QEMU_EFI.fd conv=notrunc
+    dd of=$fd/FV/AAVMF_VARS.fd  if=/dev/zero bs=1M    count=64
   '' else ''
     mkdir -vp $fd/FV
     mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV