[Qemu-commits] [qemu/qemu] aef45d: build: automatically handle GIT submodule checkout...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: aef45d51d1204f3335fb99de6658e0c5612c2b67
      
https://github.com/qemu/qemu/commit/aef45d51d1204f3335fb99de6658e0c5612c2b67
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

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

  Log Message:
  -----------
  build: automatically handle GIT submodule checkout for dtc

Currently if DTC is required by configure and not available in the host
OS install, we exit with an error message telling the user to checkout a
git submodule or install the library.

This introduces automatic handling of the git submodule checkout process
and enables it for dtc. This only runs if building from GIT, so users of
release tarballs still need the system library install. The current state
of the git checkout is stashed in .git-submodule-status, and a helper
program is used to determine if this state matches the desired submodule
state. A dependency against 'Makefile' ensures that the submodule state
is refreshed at the start of the build process

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden

[ kraxel: use /bin/sh not bash for scripts/git-submodule.sh ]
[ kraxel: fix Makefile dependencies ]

Signed-off-by: Gerd Hoffmann <address@hidden>

[fixup] Makefile dep


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

  Changed paths:
    M scripts/archive-source.sh

  Log Message:
  -----------
  docker: don't rely on submodules existing in the main checkout

When building the tarball to pass into the docker/vm test image,
the code relies on the git submodules being checked out in the
main checkout.

ie if the developer has not run 'git submodule update --init dtc'
many of the docker tests will fail due to the libfdt package not
being present in the test images. Patchew manually checks out the
dtc submodule in the main git checkout, but this is a bad idea.

When running tests we want to have a predictable set of submodules
included in the source that's tested. The build environment is
completely independent of the developers host OS, so the submodules
the developer has checked out should not be considered relevant for
the tests.

This changes the archive-source.sh script so that it clones the
current git checkout into a temporary directory, checks out a
fixed set of submodules, builds the tarball and finally removes
the temporary git clone.

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


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

  Changed paths:
    M .gitignore
    M .gitmodules
    M Makefile
    M configure
    M scripts/archive-source.sh
    A ui/keycodemapdb

  Log Message:
  -----------
  ui: add keycodemapdb repository as a GIT submodule

The https://gitlab.com/keycodemap/keycodemapdb/ repo contains a
data file mapping between all the different scancode/keycode/keysym
sets that are known, and a tool to auto-generate lookup tables for
different combinations.

It is used by GTK-VNC, SPICE-GTK and libvirt for mapping keys.
Using it in QEMU will let us replace many hand written lookup
tables with auto-generated tables from a master data source,
reducing bugs. Adding new QKeyCodes will now only require the
master table to be updated, all ~20 other tables will be
automatically updated to follow.

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden

[ kraxel: fix build ]
[ kraxel: switch repo to qemu.git mirror ]

Signed-off-by: Gerd Hoffmann <address@hidden>


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

  Changed paths:
    M Makefile
    M include/ui/input.h
    M ui/input-keymap.c

  Log Message:
  -----------
  ui: convert common input code to keycodemapdb

Replace the number_to_qcode, qcode_to_number and linux_to_qcode
tables with automatically generated tables.

Missing entries in linux_to_qcode now fixed:

  KEY_LINEFEED -> Q_KEY_CODE_LF
  KEY_KPEQUAL -> Q_KEY_CODE_KP_EQUALS
  KEY_COMPOSE -> Q_KEY_CODE_COMPOSE
  KEY_AGAIN -> Q_KEY_CODE_AGAIN
  KEY_PROPS -> Q_KEY_CODE_PROPS
  KEY_UNDO -> Q_KEY_CODE_UNDO
  KEY_FRONT -> Q_KEY_CODE_FRONT
  KEY_COPY -> Q_KEY_CODE_COPY
  KEY_OPEN -> Q_KEY_CODE_OPEN
  KEY_PASTE -> Q_KEY_CODE_PASTE
  KEY_CUT -> Q_KEY_CODE_CUT
  KEY_HELP -> Q_KEY_CODE_HELP
  KEY_MEDIA -> Q_KEY_CODE_MEDIASELECT

In addition, some fixes:

 - KEY_PLAYPAUSE now maps to Q_KEY_CODE_AUDIOPLAY, instead of
   KEY_PLAYCD. KEY_PLAYPAUSE is defined across almost all scancodes
   sets, while KEY_PLAYCD only appears in AT set1, so the former is
   a more useful mapping.

Missing entries in qcode_to_number now fixed:

  Q_KEY_CODE_AGAIN -> 0x85
  Q_KEY_CODE_PROPS -> 0x86
  Q_KEY_CODE_UNDO -> 0x87
  Q_KEY_CODE_FRONT -> 0x8c
  Q_KEY_CODE_COPY -> 0xf8
  Q_KEY_CODE_OPEN -> 0x64
  Q_KEY_CODE_PASTE -> 0x65
  Q_KEY_CODE_CUT -> 0xbc
  Q_KEY_CODE_LF -> 0x5b
  Q_KEY_CODE_HELP -> 0xf5
  Q_KEY_CODE_COMPOSE -> 0xdd
  Q_KEY_CODE_KP_EQUALS -> 0x59
  Q_KEY_CODE_MEDIASELECT -> 0xed

In addition, some fixes:

 - Q_KEY_CODE_MENU was incorrectly mapped to the compose
   scancode (0xdd) and is now mapped to 0x9e
 - Q_KEY_CODE_FIND was mapped to 0xe065 (Search) instead
   of to 0xe041 (Find)
 - Q_KEY_CODE_HIRAGANA was mapped to 0x70 (Katakanahiragana)
   instead of of 0x77 (Hirigana)
 - Q_KEY_CODE_PRINT was mapped to 0xb7 which is not a defined
   scan code in AT set 1, it is now mapped to 0x54 (sysrq)

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


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

  Changed paths:
    M ui/input.c

  Log Message:
  -----------
  ui: convert key events to QKeyCodes immediately

Always use QKeyCode in the InputKeyEvent struct, by converting key
numbers to QKeyCode at the time the event is created. This allows
the code processing / consuming key events to assume QKeyCode is
used. The only place we accept a key number in the InputKeyEvent
struct is with QMP commands sent by the user.

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


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

  Changed paths:
    M include/ui/input.h
    M ui/input.c

  Log Message:
  -----------
  ui: don't export qemu_input_event_new_key

All public code should use qemu_input_event_send_key* functions
instead of creating an event directly.

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


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

  Changed paths:
    M Makefile
    M configure
    A qemu-keymap.c

  Log Message:
  -----------
  tools: add qemu-keymap

qemu-keymap generates qemu reverse keymaps from xkb keymaps,
which can be used with the qemu "-k" command line switch.

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


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

  Changed paths:
    A pc-bios/keymaps/Makefile

  Log Message:
  -----------
  Add pc-bios/keymaps/Makefile

Update files where I think I've figured the correct xkb maps.
TODO: nl-be sl sv

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


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

  Changed paths:
    M pc-bios/keymaps/ar
    M pc-bios/keymaps/bepo
    M pc-bios/keymaps/cz
    M pc-bios/keymaps/da
    M pc-bios/keymaps/de
    M pc-bios/keymaps/de-ch
    M pc-bios/keymaps/en-gb
    M pc-bios/keymaps/en-us
    M pc-bios/keymaps/es
    M pc-bios/keymaps/et
    M pc-bios/keymaps/fi
    M pc-bios/keymaps/fo
    M pc-bios/keymaps/fr
    M pc-bios/keymaps/fr-be
    M pc-bios/keymaps/fr-ca
    M pc-bios/keymaps/fr-ch
    M pc-bios/keymaps/hr
    M pc-bios/keymaps/hu
    M pc-bios/keymaps/is
    M pc-bios/keymaps/it
    M pc-bios/keymaps/ja
    M pc-bios/keymaps/lt
    M pc-bios/keymaps/lv
    M pc-bios/keymaps/mk
    M pc-bios/keymaps/nl
    M pc-bios/keymaps/no
    M pc-bios/keymaps/pl
    M pc-bios/keymaps/pt
    M pc-bios/keymaps/pt-br
    M pc-bios/keymaps/ru
    M pc-bios/keymaps/th
    M pc-bios/keymaps/tr

  Log Message:
  -----------
  pc-bios/keymaps: keymaps update

Update the keymaps with the ones generated by qemu-keymap

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


  Commit: 82a4f1a96ed6be87c0ef6d4393b22085751bd450
      
https://github.com/qemu/qemu/commit/82a4f1a96ed6be87c0ef6d4393b22085751bd450
  Author: Anthony PERARD <address@hidden>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk: Fix deprecation of vte_terminal_copy_clipboard

vte_terminal_copy_clipboard() is deprecated in VTE 0.50.

Signed-off-by: Anthony PERARD <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2ff408de9c080f2fb5a94ebf6a209c6180c64933
      
https://github.com/qemu/qemu/commit/2ff408de9c080f2fb5a94ebf6a209c6180c64933
  Author: Anthoine Bourgeois <address@hidden>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M ui/gtk-gl-area.c

  Log Message:
  -----------
  gtk: fix wrong id between texture and framebuffer

The gd_gl_area_scanout_texture must destroy framebuffer if there is
no texture id instead of no framebuffer id.
The effect was a black screen with "-vga virtio -display gtk,gl=on"
options.
The bug was introduce by a4f113fd "gtk: use framebuffer helper functions."

Signed-off-by: Anthoine Bourgeois <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


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

  Changed paths:
    M .gitignore
    M .gitmodules
    M MAINTAINERS
    M Makefile
    M configure
    M include/ui/input.h
    A pc-bios/keymaps/Makefile
    M pc-bios/keymaps/ar
    M pc-bios/keymaps/bepo
    M pc-bios/keymaps/cz
    M pc-bios/keymaps/da
    M pc-bios/keymaps/de
    M pc-bios/keymaps/de-ch
    M pc-bios/keymaps/en-gb
    M pc-bios/keymaps/en-us
    M pc-bios/keymaps/es
    M pc-bios/keymaps/et
    M pc-bios/keymaps/fi
    M pc-bios/keymaps/fo
    M pc-bios/keymaps/fr
    M pc-bios/keymaps/fr-be
    M pc-bios/keymaps/fr-ca
    M pc-bios/keymaps/fr-ch
    M pc-bios/keymaps/hr
    M pc-bios/keymaps/hu
    M pc-bios/keymaps/is
    M pc-bios/keymaps/it
    M pc-bios/keymaps/ja
    M pc-bios/keymaps/lt
    M pc-bios/keymaps/lv
    M pc-bios/keymaps/mk
    M pc-bios/keymaps/nl
    M pc-bios/keymaps/no
    M pc-bios/keymaps/pl
    M pc-bios/keymaps/pt
    M pc-bios/keymaps/pt-br
    M pc-bios/keymaps/ru
    M pc-bios/keymaps/th
    M pc-bios/keymaps/tr
    A qemu-keymap.c
    M scripts/archive-source.sh
    A scripts/git-submodule.sh
    M ui/gtk-gl-area.c
    M ui/gtk.c
    M ui/input-keymap.c
    M ui/input.c
    A ui/keycodemapdb

  Log Message:
  -----------
  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) <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/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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e24cdd072168...a4faa2685769