diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2021-01-31 14:34:34 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-02-08 14:43:55 +0100 |
| commit | 4b956a399969c0c497a48ba469b7c674b0eb51bd (patch) | |
| tree | 5b13666ec854f7ce3d41c7e5a8500386ce7e5b6b /pc-bios/descriptors | |
| parent | 189012fcd7babafd937c4cabd5c3231be6e85fdc (diff) | |
| download | qemu-4b956a399969c0c497a48ba469b7c674b0eb51bd.zip qemu-4b956a399969c0c497a48ba469b7c674b0eb51bd.tar.gz qemu-4b956a399969c0c497a48ba469b7c674b0eb51bd.tar.bz2 | |
pc-bios/descriptors: fix paths in json files
Before the change /usr/share/qemu/firmware/50-edk2-x86_64-secure.json
contained the relative path:
"filename": "share/qemu/edk2-x86_64-secure-code.fd",
"filename": "share/qemu/edk2-i386-vars.fd",
After then change the paths are absolute:
"filename": "/usr/share/qemu/edk2-x86_64-secure-code.fd",
"filename": "/usr/share/qemu/edk2-i386-vars.fd",
The regression appeared in qemu-5.2.0 (seems to be related
to meson port).
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: "Marc-André Lureau" <marcandre.lureau@redhat.com>
CC: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Bug: https://bugs.gentoo.org/766743
Bug: https://bugs.launchpad.net/qemu/+bug/1913012
Signed-off-by: Jannik Glückert <jannik.glueckert@gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Message-Id: <20210131143434.2513363-1-slyfox@gentoo.org>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'pc-bios/descriptors')
| -rw-r--r-- | pc-bios/descriptors/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build index ac6ec66..29efa16 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -9,7 +9,7 @@ if install_edk2_blobs ] configure_file(input: files(f), output: f, - configuration: {'DATADIR': qemu_datadir}, + configuration: {'DATADIR': get_option('prefix') / qemu_datadir}, install: get_option('install_blobs'), install_dir: qemu_datadir / 'firmware') endforeach |