Skip to content

Commit 318fd12

Browse files
authored
qemu - ship ovmf vars for x86_64 and aarm64 (#40719)
the shipped 60-edk2-aarch64.json and 60-edk2-x86_64.json files do correctly state that * edk2-i386-vars.fd is the nvram-template for x86_64 * edk2-arm-vars.fd is the nvram-template for aarch64 But that was not clear to me as a consumer and I expected x86_64 vars file to be available. This is wasteful of disk space, but more clear.
1 parent 535a917 commit 318fd12

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

qemu.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: qemu
33
version: 9.2.0
4-
epoch: 1
4+
epoch: 2
55
description: "fast processor emulator"
66
copyright:
77
- license: GPL-2.0
@@ -104,6 +104,9 @@ subpackages:
104104
mkdir -p "${{targets.subpkgdir}}"/usr/share/qemu
105105
mv "${{targets.destdir}}"/usr/share/qemu/edk2-x86_64-code.fd "${{targets.subpkgdir}}"/usr/share/qemu/
106106
mv "${{targets.destdir}}"/usr/share/qemu/edk2-x86_64-secure-code.fd "${{targets.subpkgdir}}"/usr/share/qemu/
107+
108+
# i386 vars are same as format as x86_64, but this is easier for consumer.
109+
cp "${{targets.destdir}}"/usr/share/qemu/edk2-i386-vars.fd "${{targets.subpkgdir}}"/usr/share/qemu/edk2-x86_64-vars.fd
107110
test:
108111
environment:
109112
contents:
@@ -142,6 +145,9 @@ subpackages:
142145
# This is the equivalent to QEMU_EFI.fd
143146
mkdir -p "${{targets.subpkgdir}}"/usr/share/qemu
144147
mv "${{targets.destdir}}"/usr/share/qemu/edk2-aarch64-code.fd "${{targets.subpkgdir}}"/usr/share/qemu/
148+
149+
# arm vars are same as format as aarch64, but this is easier for consumer.
150+
cp "${{targets.destdir}}"/usr/share/qemu/edk2-arm-vars.fd "${{targets.subpkgdir}}"/usr/share/qemu/edk2-aarch64-vars.fd
145151
test:
146152
environment:
147153
contents:

0 commit comments

Comments
 (0)