[Qemu-commits] [qemu/qemu] ff69fd: configure: disable qemu-keymap for linux-user qemu

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ff69fd8cbfb6c9c9a6052aa714c661f7cdc4eeea
      
https://github.com/qemu/qemu/commit/ff69fd8cbfb6c9c9a6052aa714c661f7cdc4eeea
  Author: Laurent Vivier <address@hidden>
  Date:   2017-10-23 (Mon, 23 Oct 2017)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: disable qemu-keymap for linux-user qemu

We don't need qemu-keymap when we build only linux-user qemu.

When we compile in static mode, the libxkbcommon is detected
by configure if the shared one is available, but cannot
be linked if the static version is not available.

As we don't need it for qemu-linux-user, and we generally need
a static link to use it in a chroot, disable qemu-keymap in
this case.

Signed-off-by: Laurent Vivier <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2fb6eeace5fd2b693b3f26a7e20e046236a4b5cd
      
https://github.com/qemu/qemu/commit/2fb6eeace5fd2b693b3f26a7e20e046236a4b5cd
  Author: Gerd Hoffmann <address@hidden>
  Date:   2017-10-23 (Mon, 23 Oct 2017)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  ui: add qemu-keymap and shader to .gitignore

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden


  Commit: 8172bdb2d0c829462f8c4fb2cb54a768d295a747
      
https://github.com/qemu/qemu/commit/8172bdb2d0c829462f8c4fb2cb54a768d295a747
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-10-23 (Mon, 23 Oct 2017)

  Changed paths:
    M scripts/git-submodule.sh

  Log Message:
  -----------
  scripts: don't throw away stderr when checking out git submodules

The stderr from git is important if git fails to checkout modules
due to network problems, or other unexpected errors.

Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 9293fcfe253d29899e370ccf172a76b7eca49aac
      
https://github.com/qemu/qemu/commit/9293fcfe253d29899e370ccf172a76b7eca49aac
  Author: Peter Maydell <address@hidden>
  Date:   2017-10-24 (Tue, 24 Oct 2017)

  Changed paths:
    M .gitignore
    M configure
    M scripts/git-submodule.sh

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

fixes for the fallout of the recent ui and keymap merges.

# gpg: Signature made Mon 23 Oct 2017 09:02:24 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-20171023-pull-request:
  scripts: don't throw away stderr when checking out git submodules
  ui: add qemu-keymap and shader to .gitignore
  configure: disable qemu-keymap for linux-user qemu

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a61837da0f21...9293fcfe253d