diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-24 12:03:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-24 12:03:52 +0100 |
| commit | 9293fcfe253d29899e370ccf172a76b7eca49aac (patch) | |
| tree | 6e4d7466f4aca6157109117697b0aff0f793b728 | |
| parent | a61837da0f2122e01685f6b7aad3226c9a6fc289 (diff) | |
| parent | 8172bdb2d0c829462f8c4fb2cb54a768d295a747 (diff) | |
| download | qemu-9293fcfe253d29899e370ccf172a76b7eca49aac.tar.gz | |
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) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# 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 <peter.maydell@linaro.org>
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rwxr-xr-x | scripts/git-submodule.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 620eec6b47..588769b250 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /trace/generated-tcg-tracers.h /ui/shader/texture-blit-frag.h /ui/shader/texture-blit-vert.h +/ui/shader/texture-blit-flip-vert.h /ui/input-keymap-*.c *-timestamp /*-softmmu @@ -45,6 +46,7 @@ /qemu-io /qemu-ga /qemu-bridge-helper +/qemu-keymap /qemu-monitor.texi /qemu-monitor-info.texi /qemu-version.h @@ -5136,9 +5136,9 @@ if test "$softmmu" = yes ; then fi mpath=no fi -fi -if test "$xkbcommon" = "yes"; then - tools="qemu-keymap\$(EXESUF) $tools" + if test "$xkbcommon" = "yes"; then + tools="qemu-keymap\$(EXESUF) $tools" + fi fi # Probe for guest agent support/options diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index d8fbc7e47e..08932a35f0 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -32,7 +32,7 @@ status) exit $? ;; update) - git submodule update --init $modules 1>/dev/null 2>&1 + git submodule update --init $modules 1>/dev/null git submodule status $modules > "${substat}" ;; esac |