Re: [PATCH] pc-bios/descriptors: fix paths in json files

[Paolo Bonzini <pbonzini@redhat.com>]

On 31/01/21 15:34, Sergei Trofimovich wrote:
> 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
> Patch-by: Jannik Glückert
> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
> ---
>   pc-bios/descriptors/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
> index ac6ec66b00..29efa16d99 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
> 

Queued, thanks!

Paolo