Skip to content
  • Peter Maydell's avatar
    6cfdaa88
    Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging · 6cfdaa88
    Peter Maydell authored
    
    
    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: default avatarPeter Maydell <peter.maydell@linaro.org>
    6cfdaa88
    Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
    Peter Maydell authored
    
    
    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: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading