Commit 9293fcfe authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a61837da 8172bdb2

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -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

configure

+3 −3
Original line number Diff line number Diff line
@@ -5136,10 +5136,10 @@ if test "$softmmu" = yes ; then 
    fi

    mpath=no

  fi

fi

  if test "$xkbcommon" = "yes"; then

    tools="qemu-keymap\$(EXESUF) $tools"

  fi

fi



# Probe for guest agent support/options

scripts/git-submodule.sh

+1 −1
Original line number Diff line number Diff line
@@ -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