The following changes since commit d6f83a72a7db94a3ede9f5cc4fb39f9c8e89f954:

  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-testing-20200812' into staging (2020-08-21 14:51:43 +0100)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 460b4664c6ad2b88ccfb2d69ab4cbb7d6c9165a0:

  keymaps: update (2020-08-21 17:06:17 -0400)

----------------------------------------------------------------
meson fixes:

* --disable-tools --enable-system build
* s390 no-TCG build
* fdmon-io_uring
* 'shift' error message in version_ge()

----------------------------------------------------------------
Marc-André Lureau (1):
      meson: convert pc-bios/keymaps/Makefile

Paolo Bonzini (2):
      target/s390x: fix meson.build issue
      keymaps: update

Philippe Mathieu-Daudé (1):
      meson: Fix --disable-tools --enable-system builds

Stefano Garzarella (2):
      util/meson.build: fix fdmon-io_uring build
      configure: silence 'shift' error message in version_ge()

 Makefile                    |   8 --
 configure                   |   6 +-
 meson.build                 |  14 +--
 pc-bios/keymaps/.gitignore  |   1 +
 pc-bios/keymaps/Makefile    |  56 ----------
 pc-bios/keymaps/ar          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/bepo        | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/cz          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/da          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/de          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/de-ch       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/en-gb       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/en-us       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/es          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/et          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/fi          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/fo          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/fr          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/fr-be       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/fr-ca       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/fr-ch       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/hr          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/hu          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/is          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/it          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/ja          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/lt          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/lv          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/meson.build |  56 ++++++++++
 pc-bios/keymaps/mk          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/nl          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/no          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/pl          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/pt          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/pt-br       | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/ru          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/th          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/tr          | 242 +++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/meson.build         |   1 +
 target/s390x/meson.build    |   2 +-
 ui/meson.build              |   2 +-
 util/meson.build            |   2 +-
 42 files changed, 7752 insertions(+), 140 deletions(-)
 create mode 100644 pc-bios/keymaps/.gitignore
 delete mode 100644 pc-bios/keymaps/Makefile
 create mode 100644 pc-bios/keymaps/meson.build
-- 
2.26.2

On Fri, 21 Aug 2020 at 22:18, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit d6f83a72a7db94a3ede9f5cc4fb39f9c8e89f954:
>
>   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-testing-20200812' into staging (2020-08-21 14:51:43 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 460b4664c6ad2b88ccfb2d69ab4cbb7d6c9165a0:
>
>   keymaps: update (2020-08-21 17:06:17 -0400)
>
> ----------------------------------------------------------------
> meson fixes:
>
> * --disable-tools --enable-system build
> * s390 no-TCG build
> * fdmon-io_uring
> * 'shift' error message in version_ge()
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM

On Fri, 21 Aug 2020 at 22:18, Paolo Bonzini <pbonzini@redhat.com> wrote:
> ----------------------------------------------------------------
> meson fixes:
>
> * --disable-tools --enable-system build
> * s390 no-TCG build
> * fdmon-io_uring
> * 'shift' error message in version_ge()
>
> ----------------------------------------------------------------
> Marc-André Lureau (1):
>       meson: convert pc-bios/keymaps/Makefile
>
> Paolo Bonzini (2):
>       target/s390x: fix meson.build issue
>       keymaps: update

I have noticed that now if I do a build starting from a
source tree with this keymaps update, the build seems
to cause the keymap files to be modified:

e104462:bionic:qemu$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

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

no changes added to commit (use "git add" and/or "git commit -a")

The changes seem to be like this:

--- a/pc-bios/keymaps/ar
+++ b/pc-bios/keymaps/ar
@@ -776,244 +776,6 @@ XF86AudioMedia 0xed

 # evdev 247 (0xf7): no evdev -> QKeyCode mapping (xkb keysym XF86RFKill)

-# evdev 248 (0xf8): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
-
-# evdev 249 (0xf9): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
-
-# evdev 250 (0xfa): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
...
-# evdev 363 (0x16b): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
-
-# evdev 364 (0x16c): no evdev -> QKeyCode mapping (xkb keysym XF86Favorites)
-
-# evdev 365 (0x16d): no evdev -> QKeyCode mapping (xkb keysym NoSymbol)
-
-# evdev 366 (0x16e): no evdev -> QKeyCode mapping (xkb keysym XF86Keyboard)


Why is a build (which is now by definition in a build tree)
causing my source tree to be changed, and can we make it stop?

thanks
-- PMM