[Qemu-commits] [qemu/qemu] 24bdcc: nsis: Fix build for 64 bit installer

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 24bdcc9608fad3dce2bcf3362722493f1ba0f3eb
      
https://github.com/qemu/qemu/commit/24bdcc9608fad3dce2bcf3362722493f1ba0f3eb
  Author: Stefan Weil <sw@weilnetz.de>
  Date:   2020-11-26 (Thu, 26 Nov 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  nsis: Fix build for 64 bit installer

Pass cpu instead of cpu_family to the NSIS installer script.

That script checks for "x86_64" which is the cpu value,
while cpu_family is "x86".

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125191833.964753-1-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 6cfdaa88cfde716ebc8538f60a9648483049edf4
      
https://github.com/qemu/qemu/commit/6cfdaa88cfde716ebc8538f60a9648483049edf4
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-26 (Thu, 26 Nov 2020)

  Changed paths:
    M .cirrus.yml
    M configure
    M meson.build
    M tests/docker/dockerfiles/debian10.docker
    M tests/docker/dockerfiles/fedora-win32-cross.docker
    M tests/docker/dockerfiles/fedora-win64-cross.docker
    M tests/vm/freebsd
    M tests/vm/haiku.x86_64
    M tests/vm/netbsd
    M tests/vm/openbsd

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into 
staging

Remove obsolete setuptools dependency and fix Stefan's
Win32 builds.

# gpg: Signature made Thu 26 Nov 2020 14:21:28 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  nsis: Fix build for 64 bit installer
  tests/docker, tests/vm: remove setuptools from images
  configure: remove python pkg_resources check
  meson: use dependency() to find libjpeg

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/49bb5758ea75...6cfdaa88cfde