mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-12-17 21:26:13 -07:00
ui: use keycodemapdb for key code mappings, part one (v2)
ui: add qemu-keymap, update reverse keymaps (for qemu -k $map) ui: fix for vte 0.50 ui: gtk texture fix -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJZ5LBRAAoJEEy22O7T6HE4EPAQANjz0fHDy4BWjqMpuery4HQy de2t1skrvr50fS1EGDxFjzr40+ap28KluNf/5CJtkDiwyVRKfF7glWZ+aOzZAGzn DobJd3Eqz+CAgaaGlJ3XzjXZdMEusQ8SYyJ5uOmWTDCo0iN72+1kOqYnESAZM5pb WfDybUearA3ylzR8dE8AuF/+f3nC66mddyMgVOwJ4AuEWnKMXDGyYTu794I04Lnz erM2a1g5hGAWNdzmMU9PUuBrnndwybm0gkkaMDqFavw3vjhcrVm5kFmwpgJ0ZXCK pQp1lcvcIYW6Nsu79uE2Esc/wqnGqR3NBEpl1R81O077/kZhluSyZVd01nNEjr0U hLCh7blebxIH3/6LzY04UVDB4f8ORo6TXNpXZaoZ/vg6Vrt5omYLRUO9Cp3++C4z mSC+mVW5zCSbhQEIXhaSpQxA721jrm7uyqaYt2rreRUJXOvXujoH+GOfC96GQTRr 9Oay5vJrWrY8djlTCTpJV+x5/p2bA9jbfO2918CPfoE+ARNGK6okU5xur/SfY38o aFmtStoP5uRGTNC+vtasxneUiV0oR7SdNXDhO09KlTA964NilOUs0U5Bo5IfuqFE 3Jy50TNAxICyFLn4AJFIdihKZiodZMzr0VjurmYY6LEeba2DfV77s/uHW5ft+LNv KjZl2BrOwdX1jhHGQB0E =N+oP -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/ui-20171016-pull-request' into staging ui: use keycodemapdb for key code mappings, part one (v2) ui: add qemu-keymap, update reverse keymaps (for qemu -k $map) ui: fix for vte 0.50 ui: gtk texture fix # gpg: Signature made Mon 16 Oct 2017 14:12:49 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/ui-20171016-pull-request: gtk: fix wrong id between texture and framebuffer ui/gtk: Fix deprecation of vte_terminal_copy_clipboard pc-bios/keymaps: keymaps update Add pc-bios/keymaps/Makefile tools: add qemu-keymap ui: don't export qemu_input_event_new_key ui: convert key events to QKeyCodes immediately ui: convert common input code to keycodemapdb ui: add keycodemapdb repository as a GIT submodule docker: don't rely on submodules existing in the main checkout build: automatically handle GIT submodule checkout for dtc Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
a4faa26857
47 changed files with 24556 additions and 2067 deletions
|
|
@ -18,15 +18,37 @@ if test $# -lt 1; then
|
|||
error "Usage: $0 <output tarball>"
|
||||
fi
|
||||
|
||||
tar_file="$1"
|
||||
list_file="$1.list"
|
||||
submodules=$(git submodule foreach --recursive --quiet 'echo $name')
|
||||
tar_file=`realpath "$1"`
|
||||
list_file="${tar_file}.list"
|
||||
vroot_dir="${tar_file}.vroot"
|
||||
|
||||
if test $? -ne 0; then
|
||||
error "git submodule command failed"
|
||||
# We want a predictable list of submodules for builds, that is
|
||||
# independent of what the developer currently has initialized
|
||||
# in their checkout, because the build environment is completely
|
||||
# different to the host OS.
|
||||
submodules="dtc ui/keycodemapdb"
|
||||
|
||||
trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15
|
||||
|
||||
if git diff-index --quiet HEAD -- &>/dev/null
|
||||
then
|
||||
HEAD=HEAD
|
||||
else
|
||||
HEAD=`git stash create`
|
||||
fi
|
||||
git clone --shared . "$vroot_dir"
|
||||
test $? -ne 0 && error "failed to clone into '$vroot_dir'"
|
||||
|
||||
trap "status=$?; rm -f \"$list_file\"; exit \$status" 0 1 2 3 15
|
||||
cd "$vroot_dir"
|
||||
test $? -ne 0 && error "failed to change into '$vroot_dir'"
|
||||
|
||||
git checkout $HEAD
|
||||
test $? -ne 0 && error "failed to checkout $HEAD revision"
|
||||
|
||||
for sm in $submodules; do
|
||||
git submodule update --init $sm
|
||||
test $? -ne 0 && error "failed to init submodule $sm"
|
||||
done
|
||||
|
||||
if test -n "$submodules"; then
|
||||
{
|
||||
|
|
|
|||
38
scripts/git-submodule.sh
Executable file
38
scripts/git-submodule.sh
Executable file
|
|
@ -0,0 +1,38 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# This code is licensed under the GPL version 2 or later. See
|
||||
# the COPYING file in the top-level directory.
|
||||
|
||||
set -e
|
||||
|
||||
substat=".git-submodule-status"
|
||||
|
||||
command=$1
|
||||
shift
|
||||
modules="$@"
|
||||
|
||||
if test -z "$modules"
|
||||
then
|
||||
test -e $substat || touch $substat
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ! test -e ".git"
|
||||
then
|
||||
echo "$0: unexpectedly called with submodules but no git checkout exists"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "$command" in
|
||||
status)
|
||||
test -f "$substat" || exit 1
|
||||
trap "rm -f ${substat}.tmp" EXIT
|
||||
git submodule status $modules > "${substat}.tmp"
|
||||
diff "${substat}" "${substat}.tmp" >/dev/null
|
||||
exit $?
|
||||
;;
|
||||
update)
|
||||
git submodule update --init $modules 1>/dev/null 2>&1
|
||||
git submodule status $modules > "${substat}"
|
||||
;;
|
||||
esac
|
||||
Loading…
Add table
Add a link
Reference in a new issue