[PATCH 1/2] build-sys: fix undefined ARCH error

[PATCH 1/2] build-sys: fix undefined ARCH error

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

../qga/meson.build:76:4: ERROR: Key ARCH is not in the dictionary.

Fixes commit 823eb013 ("configure, meson: move ARCH to meson.build")

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qga/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/meson.build b/qga/meson.build
index cfb1fbc0853c..613ecb980286 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -75,7 +75,7 @@ if targetos == 'windows'
     endif
     qga_msi = custom_target('QGA MSI',
                             input: files('installer/qemu-ga.wxs'),
-                            output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
+                            output: 'qemu-ga-@0@.msi'.format(host_arch),
                             depends: deps,
                             command: [
                               find_program('env'),
-- 
2.34.1.428.gdcc0cd074f0c

[PATCH 2/2] docker: add msitools to Fedora/mingw cross

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

That should help catch build issues/regressions with wixl.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/docker/dockerfiles/fedora-win32-cross.docker | 1 +
 tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index aad39dd97ff4..d80e66c6517d 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -29,6 +29,7 @@ ENV PACKAGES \
     mingw32-pixman \
     mingw32-pkg-config \
     mingw32-SDL2 \
+    msitools \
     perl \
     perl-Test-Harness \
     python3 \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 9a224a619bd4..2b12b94ccfb4 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -26,6 +26,7 @@ ENV PACKAGES \
     mingw64-libusbx \
     mingw64-pixman \
     mingw64-pkg-config \
+    msitools \
     perl \
     perl-Test-Harness \
     python3 \
-- 
2.34.1.428.gdcc0cd074f0c

Re: [PATCH 2/2] docker: add msitools to Fedora/mingw cross

[Philippe Mathieu-Daudé via]

On 14/1/22 09:43, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> That should help catch build issues/regressions with wixl.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   tests/docker/dockerfiles/fedora-win32-cross.docker | 1 +
>   tests/docker/dockerfiles/fedora-win64-cross.docker | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
> index aad39dd97ff4..d80e66c6517d 100644
> --- a/tests/docker/dockerfiles/fedora-win32-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
> @@ -29,6 +29,7 @@ ENV PACKAGES \
>       mingw32-pixman \
>       mingw32-pkg-config \
>       mingw32-SDL2 \
> +    msitools \
>       perl \
>       perl-Test-Harness \
>       python3 \
> diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
> index 9a224a619bd4..2b12b94ccfb4 100644
> --- a/tests/docker/dockerfiles/fedora-win64-cross.docker
> +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
> @@ -26,6 +26,7 @@ ENV PACKAGES \
>       mingw64-libusbx \
>       mingw64-pixman \
>       mingw64-pkg-config \
> +    msitools \
>       perl \
>       perl-Test-Harness \
>       python3 \

This clashes with testing/next pull request:
https://lore.kernel.org/qemu-devel/20220112112722.3641051-10-alex.bennee@linaro.org/

Re: [PATCH 1/2] build-sys: fix undefined ARCH error

[Philippe Mathieu-Daudé via]

On 14/1/22 09:43, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> ../qga/meson.build:76:4: ERROR: Key ARCH is not in the dictionary.
> 
> Fixes commit 823eb013 ("configure, meson: move ARCH to meson.build")
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   qga/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH 1/2] build-sys: fix undefined ARCH error

[Paolo Bonzini]

On 1/14/22 09:43, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> ../qga/meson.build:76:4: ERROR: Key ARCH is not in the dictionary.
> 
> Fixes commit 823eb013 ("configure, meson: move ARCH to meson.build")
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>   qga/meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qga/meson.build b/qga/meson.build
> index cfb1fbc0853c..613ecb980286 100644
> --- a/qga/meson.build
> +++ b/qga/meson.build
> @@ -75,7 +75,7 @@ if targetos == 'windows'
>       endif
>       qga_msi = custom_target('QGA MSI',
>                               input: files('installer/qemu-ga.wxs'),
> -                            output: 'qemu-ga-@0@.msi'.format(config_host['ARCH']),
> +                            output: 'qemu-ga-@0@.msi'.format(host_arch),
>                               depends: deps,
>                               command: [
>                                 find_program('env'),

Queued both, thanks.

Paolo