[Qemu-commits] [qemu/qemu] ddcf60: meson: drop keymaps symlink

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ddcf607fa3d6881cf0286a9b88a40fde265cbe37
      
https://github.com/qemu/qemu/commit/ddcf607fa3d6881cf0286a9b88a40fde265cbe37
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  meson: drop keymaps symlink

We are building the keymaps by default now.  Drop the keymaps symlink
so the generated files are actually written to the build tree not the
source tree.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Tested-by: Klaus Jensen <k.jensen@samsung.com>
Tested-by: Bin Meng <bin.meng@windriver.com>
Message-id: 20200824074057.3673-1-kraxel@redhat.com


  Commit: 4113f4cfeea57774d492af48aec97a043d82a32e
      
https://github.com/qemu/qemu/commit/4113f4cfeea57774d492af48aec97a043d82a32e
  Author: Laurent Vivier <laurent@vivier.eu>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M configure
    M meson.build
    M meson_options.txt
    M ui/meson.build

  Log Message:
  -----------
  meson: move xkbcommon to meson

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-2-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 9755c94a50c8b845ad133a6e660f55ca131b9c7a
      
https://github.com/qemu/qemu/commit/9755c94a50c8b845ad133a6e660f55ca131b9c7a
  Author: Laurent Vivier <laurent@vivier.eu>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: avoid compiling qemu-keymap by default

qemu-keymap is not needed with linux-user, so disable it by default if
tools and system are disabled (tools are disabled by default with linux-user).

Avoid this error with statically linked binaries:

    Linking target qemu-keymap
    /usr/bin/ld: cannot find -lxkbcommon

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 20200824152430.1844159-3-laurent@vivier.eu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 7774e403f2ac58b3e87bfe8d2f77676501ba893e
      
https://github.com/qemu/qemu/commit/7774e403f2ac58b3e87bfe8d2f77676501ba893e
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-08-25 (Tue, 25 Aug 2020)

  Changed paths:
    M configure
    M meson.build
    M meson_options.txt
    M ui/meson.build

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/fixes-20200825-pull-request' into staging

meson: keymap fixes

# gpg: Signature made Tue 25 Aug 2020 07:19:15 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-20200825-pull-request:
  meson: avoid compiling qemu-keymap by default
  meson: move xkbcommon to meson
  meson: drop keymaps symlink

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


Compare: https://github.com/qemu/qemu/compare/44423107e7b5...7774e403f2ac