OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJZ7aIQAAoJEEy22O7T6HE4c1sQAItAUbuYK7QZLQovy641o/Ax
 MkCi7x0eTg0MAouCHZoVAWgUFZ0gp9mwrEg0HRw4qAdJT1QdkzyseBuuK6hFglz3
 G4Oy1nIdNqFuuLDDXxXQpfJWvf1OKlYpcqh5gtMf6lD3hg1bRsN3/Y+elBiY4xIL
 roCwjTFafQVKkNcmTZBewmfnFQhAsaD2Fwf8EI1ugjFuPfWrCOCWe4/NqqXLX7Ms
 TWb5swbjlTaVAeVpmr522gXrClFI9ZW6FS2JePDxeJDjdfq0Paf91YiIT9Yl5b76
 IB5IIOTr5JskDhhjv01JqGxyDCN1N9bcyMtwxl5HB4lFKxdw+h5G9UyMSnnFGfWM
 aek6XsgvgMVulDWSWlMzwCq8xwFikCeLfjboQ/asYyzaf5DOqm1PGOdqbrg2ibri
 qon1V/eik44d87wbN8xQm1slGBAFX68o91C0EVJelI1IWsU60LxWWZePHXGiXJlP
 BA4PGLpUWznLnGGiL3GaS2H+QFOb5yPcF9qEBT03UgLBC3g1Fw5dAG76W075E9cS
 SeoepArltkRVjt+12ZCHi4ZmoDQBkPlqSom7Ewt37sklPE1VcqlRi2YeyBhDtObS
 NcD8mSuDx+yGyplhmSaRifJ3bewO+7kmzu0MjVdOq3QUQRtiZjEgy5q2KEfM82Ac
 U6Ezb+NGfVZfAJVCubzg
 =+CWs
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-10-24 12:03:52 +01:00
parent a61837da0f 8172bdb2d0
commit 9293fcfe25
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -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

6
configure vendored
View File

@ -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

2
scripts/git-submodule.sh
View File

@ -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