configure | 75 ++- Makefile | 55 ++- include/ui/input.h | 12 +- qemu-keymap.c | 258 +++++++++++ ui/gtk.c | 5 + ui/input-keymap.c | 336 +------------- ui/input.c | 24 +- .gitignore | 2 + .gitmodules | 3 + MAINTAINERS | 6 + pc-bios/keymaps/Makefile | 56 +++ pc-bios/keymaps/ar | 819 +++++++++++++++++++++++++++++---- pc-bios/keymaps/bepo | 1108 +++++++++++++++++++++++++++++++-------------- pc-bios/keymaps/cz | 861 ++++++++++++++++++++++++++++++++--- pc-bios/keymaps/da | 732 +++++++++++++++++++++++++++++- pc-bios/keymaps/de | 767 ++++++++++++++++++++++++++++++- pc-bios/keymaps/de-ch | 915 ++++++++++++++++++++++++++++++++----- pc-bios/keymaps/en-gb | 724 ++++++++++++++++++++++++++++- pc-bios/keymaps/en-us | 718 ++++++++++++++++++++++++++++- pc-bios/keymaps/es | 744 +++++++++++++++++++++++++++++- pc-bios/keymaps/et | 818 +++++++++++++++++++++++++++++---- pc-bios/keymaps/fi | 814 ++++++++++++++++++++++++++++++--- pc-bios/keymaps/fo | 881 ++++++++++++++++++++++++++++++++--- pc-bios/keymaps/fr | 704 +++++++++++++++++++++++++++- pc-bios/keymaps/fr-be | 724 ++++++++++++++++++++++++++++- pc-bios/keymaps/fr-ca | 804 ++++++++++++++++++++++++++++++-- pc-bios/keymaps/fr-ch | 800 ++++++++++++++++++++++++++++++-- pc-bios/keymaps/hr | 752 +++++++++++++++++++++++++++++- pc-bios/keymaps/hu | 887 ++++++++++++++++++++++++++++++++---- pc-bios/keymaps/is | 802 +++++++++++++++++++++++++++++--- pc-bios/keymaps/it | 757 ++++++++++++++++++++++++++++++- pc-bios/keymaps/ja | 792 +++++++++++++++++++++++++++++--- pc-bios/keymaps/lt | 844 ++++++++++++++++++++++++++++++++-- pc-bios/keymaps/lv | 766 +++++++++++++++++++++++++++++-- pc-bios/keymaps/mk | 814 +++++++++++++++++++++++++++++---- pc-bios/keymaps/nl | 794 +++++++++++++++++++++++++++++++- pc-bios/keymaps/no | 758 ++++++++++++++++++++++++++++++- pc-bios/keymaps/pl | 789 ++++++++++++++++++++++++++++++-- pc-bios/keymaps/pt | 737 +++++++++++++++++++++++++++++- pc-bios/keymaps/pt-br | 775 ++++++++++++++++++++++++++++++- pc-bios/keymaps/ru | 835 ++++++++++++++++++++++++++++++---- pc-bios/keymaps/th | 878 +++++++++++++++++++++++++++++------ pc-bios/keymaps/tr | 819 ++++++++++++++++++++++++++++++--- scripts/archive-source.sh | 34 +- scripts/git-submodule.sh | 38 ++ ui/keycodemapdb | 1 + 46 files changed, 24564 insertions(+), 2073 deletions(-) create mode 100644 qemu-keymap.c create mode 100644 pc-bios/keymaps/Makefile create mode 100755 scripts/git-submodule.sh create mode 160000 ui/keycodemapdb
The following changes since commit 567d0a19c7998fa366598b83d5a6e5f0759d3ea9: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging (2017-10-10 13:25:46 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20171011-pull-request for you to fetch changes up to 92328b7104ffc825f10c33f3fd1866e940a523f7: ui/gtk: Fix deprecation of vte_terminal_copy_clipboard (2017-10-11 10:03:31 +0200) ---------------------------------------------------------------- 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 ---------------------------------------------------------------- Anthony PERARD (1): ui/gtk: Fix deprecation of vte_terminal_copy_clipboard Daniel P. Berrange (6): build: automatically handle GIT submodule checkout for dtc docker: don't rely on submodules existing in the main checkout ui: add keycodemapdb repository as a GIT submodule ui: convert common input code to keycodemapdb ui: convert key events to QKeyCodes immediately ui: don't export qemu_input_event_new_key Gerd Hoffmann (3): tools: add qemu-keymap Add pc-bios/keymaps/Makefile pc-bios/keymaps: keymaps update configure | 75 ++- Makefile | 55 ++- include/ui/input.h | 12 +- qemu-keymap.c | 258 +++++++++++ ui/gtk.c | 5 + ui/input-keymap.c | 336 +------------- ui/input.c | 24 +- .gitignore | 2 + .gitmodules | 3 + MAINTAINERS | 6 + pc-bios/keymaps/Makefile | 56 +++ pc-bios/keymaps/ar | 819 +++++++++++++++++++++++++++++---- pc-bios/keymaps/bepo | 1108 +++++++++++++++++++++++++++++++-------------- pc-bios/keymaps/cz | 861 ++++++++++++++++++++++++++++++++--- pc-bios/keymaps/da | 732 +++++++++++++++++++++++++++++- pc-bios/keymaps/de | 767 ++++++++++++++++++++++++++++++- pc-bios/keymaps/de-ch | 915 ++++++++++++++++++++++++++++++++----- pc-bios/keymaps/en-gb | 724 ++++++++++++++++++++++++++++- pc-bios/keymaps/en-us | 718 ++++++++++++++++++++++++++++- pc-bios/keymaps/es | 744 +++++++++++++++++++++++++++++- pc-bios/keymaps/et | 818 +++++++++++++++++++++++++++++---- pc-bios/keymaps/fi | 814 ++++++++++++++++++++++++++++++--- pc-bios/keymaps/fo | 881 ++++++++++++++++++++++++++++++++--- pc-bios/keymaps/fr | 704 +++++++++++++++++++++++++++- pc-bios/keymaps/fr-be | 724 ++++++++++++++++++++++++++++- pc-bios/keymaps/fr-ca | 804 ++++++++++++++++++++++++++++++-- pc-bios/keymaps/fr-ch | 800 ++++++++++++++++++++++++++++++-- pc-bios/keymaps/hr | 752 +++++++++++++++++++++++++++++- pc-bios/keymaps/hu | 887 ++++++++++++++++++++++++++++++++---- pc-bios/keymaps/is | 802 +++++++++++++++++++++++++++++--- pc-bios/keymaps/it | 757 ++++++++++++++++++++++++++++++- pc-bios/keymaps/ja | 792 +++++++++++++++++++++++++++++--- pc-bios/keymaps/lt | 844 ++++++++++++++++++++++++++++++++-- pc-bios/keymaps/lv | 766 +++++++++++++++++++++++++++++-- pc-bios/keymaps/mk | 814 +++++++++++++++++++++++++++++---- pc-bios/keymaps/nl | 794 +++++++++++++++++++++++++++++++- pc-bios/keymaps/no | 758 ++++++++++++++++++++++++++++++- pc-bios/keymaps/pl | 789 ++++++++++++++++++++++++++++++-- pc-bios/keymaps/pt | 737 +++++++++++++++++++++++++++++- pc-bios/keymaps/pt-br | 775 ++++++++++++++++++++++++++++++- pc-bios/keymaps/ru | 835 ++++++++++++++++++++++++++++++---- pc-bios/keymaps/th | 878 +++++++++++++++++++++++++++++------ pc-bios/keymaps/tr | 819 ++++++++++++++++++++++++++++++--- scripts/archive-source.sh | 34 +- scripts/git-submodule.sh | 38 ++ ui/keycodemapdb | 1 + 46 files changed, 24564 insertions(+), 2073 deletions(-) create mode 100644 qemu-keymap.c create mode 100644 pc-bios/keymaps/Makefile create mode 100755 scripts/git-submodule.sh create mode 160000 ui/keycodemapdb -- 2.9.3
On 11 October 2017 at 09:35, Gerd Hoffmann <kraxel@redhat.com> wrote: > The following changes since commit 567d0a19c7998fa366598b83d5a6e5f0759d3ea9: > > Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging (2017-10-10 13:25:46 +0100) > > are available in the git repository at: > > git://git.kraxel.org/qemu tags/ui-20171011-pull-request > > for you to fetch changes up to 92328b7104ffc825f10c33f3fd1866e940a523f7: > > ui/gtk: Fix deprecation of vte_terminal_copy_clipboard (2017-10-11 10:03:31 +0200) > > ---------------------------------------------------------------- > 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 > > ---------------------------------------------------------------- Build failures: NetBSD: CC ui/input-keymap.o /root/qemu/ui/input-keymap.c:8:44: fatal error: ui/input-keymap-linux-to-qcode.c: No such file or directory #include "ui/input-keymap-linux-to-qcode.c" ^ FreeBSD: CC ui/input-keymap.o /root/qemu/ui/input-keymap.c:8:10: fatal error: 'ui/input-keymap-linux-to-qcode.c' file not found #include "ui/input-keymap-linux-to-qcode.c" ^ OpenBSD: gmake: Entering directory '/home/qemu/build/all' /bin/sh: ./scripts/git-submodule.sh: No such file or directory gmake: Leaving directory '/home/qemu/build/all' gmake: Entering directory '/home/qemu/build/all' GIT /bin/sh: ./scripts/git-submodule.sh: No such file or directory gmake: *** [Makefile:30: git-submodule-update] Error 1 gmake: Leaving directory '/home/qemu/build/all' gmake: *** Waiting for unfinished jobs.... gmake: Entering directory '/home/qemu/build/all' config-host.mak is out-of-date, running configure Install prefix /usr/local [configure output snipped] gmake: Leaving directory '/home/qemu/build/all' AArch32 Linux: make: Entering directory '/home/peter.maydell/qemu/build/all-a32' config-host.mak is out-of-date, running configure Install prefix /usr/local BIOS directory /usr/local/share/qemu [...] VxHS block device no GEN config-host.h GEN module_block.h GEN ui/input-keymap-linux-to-qcode.c GEN ui/input-keymap-qcode-to-qnum.c GEN ui/input-keymap-qnum-to-qcode.c GIT ui/keycodemapdb dtc GEN trace/generated-tcg-tracers.h GEN trace/generated-helpers-wrappers.h GEN trace/generated-helpers.h GEN trace/generated-helpers.c Makefile:30: recipe for target 'git-submodule-update' failed make: *** [git-submodule-update] Error 128 make: *** Waiting for unfinished jobs.... make: Leaving directory '/home/peter.maydell/qemu/build/all-a32' The OpenBSD failure is because make now tries to run a script that uses #!/bin/bash, and this machine doesn't have bash installed. Do we really need to add bash to our build-dependencies? The script doesn't seem like it's doing anything that critically requires bash... thanks -- PMM
On 11.10.2017 16:37, Peter Maydell wrote: > The OpenBSD failure is because make now tries to run a > script that uses #!/bin/bash, and this machine doesn't > have bash installed. Do we really need to add bash to > our build-dependencies? The script doesn't seem like it's > doing anything that critically requires bash... NetBSD installs bash by default to /usr/pkg/bin/bash, FreeBSD installs it to /usr/local/bin/bash. If bash is really needed it should be used with the "#!/usr/bin/env bash" shebang.
On Wed, Oct 11, 2017 at 03:37:08PM +0100, Peter Maydell wrote: > On 11 October 2017 at 09:35, Gerd Hoffmann <kraxel@redhat.com> wrote: > > The following changes since commit 567d0a19c7998fa366598b83d5a6e5f0759d3ea9: > > > > Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging (2017-10-10 13:25:46 +0100) > > > > are available in the git repository at: > > > > git://git.kraxel.org/qemu tags/ui-20171011-pull-request > > > > for you to fetch changes up to 92328b7104ffc825f10c33f3fd1866e940a523f7: > > > > ui/gtk: Fix deprecation of vte_terminal_copy_clipboard (2017-10-11 10:03:31 +0200) > > > > ---------------------------------------------------------------- > > 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 > > > > ---------------------------------------------------------------- > > Build failures: > > NetBSD: > CC ui/input-keymap.o > /root/qemu/ui/input-keymap.c:8:44: fatal error: > ui/input-keymap-linux-to-qcode.c: No such file or directory > #include "ui/input-keymap-linux-to-qcode.c" > ^ > > FreeBSD: > > > CC ui/input-keymap.o > /root/qemu/ui/input-keymap.c:8:10: fatal error: > 'ui/input-keymap-linux-to-qcode.c' file not found > #include "ui/input-keymap-linux-to-qcode.c" > ^ So something is still racing in these two. I don't suppose you have the full log - interested if it ever run the "GIT ui/keycodemapdb dtc" rule and/or re-ran configure earlier, or if this is literally all it did ? > > OpenBSD: > > gmake: Entering directory '/home/qemu/build/all' > /bin/sh: ./scripts/git-submodule.sh: No such file or directory > gmake: Leaving directory '/home/qemu/build/all' > gmake: Entering directory '/home/qemu/build/all' > GIT > /bin/sh: ./scripts/git-submodule.sh: No such file or directory > gmake: *** [Makefile:30: git-submodule-update] Error 1 > gmake: Leaving directory '/home/qemu/build/all' > gmake: *** Waiting for unfinished jobs.... > gmake: Entering directory '/home/qemu/build/all' > config-host.mak is out-of-date, running configure > Install prefix /usr/local > [configure output snipped] > gmake: Leaving directory '/home/qemu/build/all' > > AArch32 Linux: > > make: Entering directory '/home/peter.maydell/qemu/build/all-a32' > config-host.mak is out-of-date, running configure > Install prefix /usr/local > BIOS directory /usr/local/share/qemu > [...] > VxHS block device no > GEN config-host.h > GEN module_block.h > GEN ui/input-keymap-linux-to-qcode.c > GEN ui/input-keymap-qcode-to-qnum.c > GEN ui/input-keymap-qnum-to-qcode.c > GIT ui/keycodemapdb dtc > GEN trace/generated-tcg-tracers.h > GEN trace/generated-helpers-wrappers.h > GEN trace/generated-helpers.h > GEN trace/generated-helpers.c > Makefile:30: recipe for target 'git-submodule-update' failed Damn, we should not throw away stderr in scripts/git-submodule.sh, as its hides whatever error occurred for you here. > make: *** [git-submodule-update] Error 128 > make: *** Waiting for unfinished jobs.... > make: Leaving directory '/home/peter.maydell/qemu/build/all-a32' > > > The OpenBSD failure is because make now tries to run a > script that uses #!/bin/bash, and this machine doesn't > have bash installed. Do we really need to add bash to > our build-dependencies? The script doesn't seem like it's > doing anything that critically requires bash... Yeah, that's easily replacable with /bin/sh Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 11 October 2017 at 16:49, Daniel P. Berrange <berrange@redhat.com> wrote: > On Wed, Oct 11, 2017 at 03:37:08PM +0100, Peter Maydell wrote: >> Build failures: >> >> NetBSD: >> CC ui/input-keymap.o >> /root/qemu/ui/input-keymap.c:8:44: fatal error: >> ui/input-keymap-linux-to-qcode.c: No such file or directory >> #include "ui/input-keymap-linux-to-qcode.c" >> ^ >> >> FreeBSD: >> >> >> CC ui/input-keymap.o >> /root/qemu/ui/input-keymap.c:8:10: fatal error: >> 'ui/input-keymap-linux-to-qcode.c' file not found >> #include "ui/input-keymap-linux-to-qcode.c" >> ^ > > So something is still racing in these two. > > I don't suppose you have the full log - interested if it > ever run the "GIT ui/keycodemapdb dtc" rule and/or > re-ran configure earlier, or if this is literally all it > did ? For NetBSD we have: From git://git.linaro.org/people/pmaydell/qemu-arm bac9608320..54070377a3 staging -> pmaydell/staging gmake: Entering directory '/root/qemu/build/all' sh: ./scripts/git-submodule.sh: not found gmake: Leaving directory '/root/qemu/build/all' gmake: Entering directory '/root/qemu/build/all' config-host.mak is out-of-date, running configure Install prefix /usr/local BIOS directory /usr/local/share/qemu firmware path /usr/local/share/qemu-firmware binary directory /usr/local/bin library directory /usr/local/lib module directory /usr/local/lib/qemu libexec directory /usr/local/libexec include directory /usr/local/include config directory /usr/local/etc local state directory /usr/local/var Manual directory /usr/local/share/man ELF interp prefix /usr/gnemul/qemu-%M Source path /root/qemu GIT submodules ui/keycodemapdb dtc C compiler cc Host C compiler cc C++ compiler c++ [...] jemalloc support no avx2 optimization yes replication support yes VxHS block device no gmake: Leaving directory '/root/qemu/build/all' gmake: Entering directory '/root/qemu/build/all' GEN ui/input-keymap-linux-to-qcode.c gmake: Leaving directory '/root/qemu/build/all' gmake: Entering directory '/root/qemu/build/all' [...] gmake: Leaving directory '/root/qemu/build/all' gmake: Entering directory '/root/qemu/build/all' CC ui/input-keymap.o /root/qemu/ui/input-keymap.c:8:44: fatal error: ui/input-keymap-linux-to-qcode.c: No such file or directory I didn't notice the 'git-submodule.sh not found' issue before: looks like that's the same /bin/bash problem as OpenBSD, maybe, plus something not noticing the failure? >> AArch32 Linux: >> >> make: Entering directory '/home/peter.maydell/qemu/build/all-a32' >> config-host.mak is out-of-date, running configure >> Install prefix /usr/local >> BIOS directory /usr/local/share/qemu >> [...] >> VxHS block device no >> GEN config-host.h >> GEN module_block.h >> GEN ui/input-keymap-linux-to-qcode.c >> GEN ui/input-keymap-qcode-to-qnum.c >> GEN ui/input-keymap-qnum-to-qcode.c >> GIT ui/keycodemapdb dtc >> GEN trace/generated-tcg-tracers.h >> GEN trace/generated-helpers-wrappers.h >> GEN trace/generated-helpers.h >> GEN trace/generated-helpers.c >> Makefile:30: recipe for target 'git-submodule-update' failed > > Damn, we should not throw away stderr in scripts/git-submodule.sh, > as its hides whatever error occurred for you here. I edited out the stdout/stderr throwaway on the git submodule command: $ ./scripts/git-submodule.sh update ui/keycodemapdb dtc Cloning into 'ui/keycodemapdb'... fatal: unable to access 'https://gitlab.com/keycodemap/keycodemapdb.git/': Problem with the SSL CA cert (path? access rights?) fatal: clone of 'https://gitlab.com/keycodemap/keycodemapdb.git' into submodule path 'ui/keycodemapdb' failed thanks -- PMM
On Wed, Oct 11, 2017 at 05:45:04PM +0100, Peter Maydell wrote: > On 11 October 2017 at 16:49, Daniel P. Berrange <berrange@redhat.com> wrote: > > On Wed, Oct 11, 2017 at 03:37:08PM +0100, Peter Maydell wrote: > >> Build failures: > >> > >> NetBSD: > >> CC ui/input-keymap.o > >> /root/qemu/ui/input-keymap.c:8:44: fatal error: > >> ui/input-keymap-linux-to-qcode.c: No such file or directory > >> #include "ui/input-keymap-linux-to-qcode.c" > >> ^ > >> > >> FreeBSD: > >> > >> > >> CC ui/input-keymap.o > >> /root/qemu/ui/input-keymap.c:8:10: fatal error: > >> 'ui/input-keymap-linux-to-qcode.c' file not found > >> #include "ui/input-keymap-linux-to-qcode.c" > >> ^ > > > > So something is still racing in these two. > > > > I don't suppose you have the full log - interested if it > > ever run the "GIT ui/keycodemapdb dtc" rule and/or > > re-ran configure earlier, or if this is literally all it > > did ? > > For NetBSD we have: > From git://git.linaro.org/people/pmaydell/qemu-arm > bac9608320..54070377a3 staging -> pmaydell/staging > gmake: Entering directory '/root/qemu/build/all' > sh: ./scripts/git-submodule.sh: not found > gmake: Leaving directory '/root/qemu/build/all' > gmake: Entering directory '/root/qemu/build/all' > config-host.mak is out-of-date, running configure > Install prefix /usr/local > BIOS directory /usr/local/share/qemu > firmware path /usr/local/share/qemu-firmware > binary directory /usr/local/bin > library directory /usr/local/lib > module directory /usr/local/lib/qemu > libexec directory /usr/local/libexec > include directory /usr/local/include > config directory /usr/local/etc > local state directory /usr/local/var > Manual directory /usr/local/share/man > ELF interp prefix /usr/gnemul/qemu-%M > Source path /root/qemu > GIT submodules ui/keycodemapdb dtc > C compiler cc > Host C compiler cc > C++ compiler c++ > [...] > jemalloc support no > avx2 optimization yes > replication support yes > VxHS block device no > gmake: Leaving directory '/root/qemu/build/all' > gmake: Entering directory '/root/qemu/build/all' > GEN ui/input-keymap-linux-to-qcode.c > gmake: Leaving directory '/root/qemu/build/all' > gmake: Entering directory '/root/qemu/build/all' > [...] > gmake: Leaving directory '/root/qemu/build/all' > gmake: Entering directory '/root/qemu/build/all' > CC ui/input-keymap.o > /root/qemu/ui/input-keymap.c:8:44: fatal error: > ui/input-keymap-linux-to-qcode.c: No such file or directory > > > I didn't notice the 'git-submodule.sh not found' issue before: > looks like that's the same /bin/bash problem as OpenBSD, > maybe, plus something not noticing the failure? Yeah looks the same. I'll investigate the error status checking I'll assume FreeBSD also hit the bash problem. > > >> AArch32 Linux: > >> > >> make: Entering directory '/home/peter.maydell/qemu/build/all-a32' > >> config-host.mak is out-of-date, running configure > >> Install prefix /usr/local > >> BIOS directory /usr/local/share/qemu > >> [...] > >> VxHS block device no > >> GEN config-host.h > >> GEN module_block.h > >> GEN ui/input-keymap-linux-to-qcode.c > >> GEN ui/input-keymap-qcode-to-qnum.c > >> GEN ui/input-keymap-qnum-to-qcode.c > >> GIT ui/keycodemapdb dtc > >> GEN trace/generated-tcg-tracers.h > >> GEN trace/generated-helpers-wrappers.h > >> GEN trace/generated-helpers.h > >> GEN trace/generated-helpers.c > >> Makefile:30: recipe for target 'git-submodule-update' failed > > > > Damn, we should not throw away stderr in scripts/git-submodule.sh, > > as its hides whatever error occurred for you here. > > I edited out the stdout/stderr throwaway on the git submodule command: > > $ ./scripts/git-submodule.sh update ui/keycodemapdb dtc > Cloning into 'ui/keycodemapdb'... > fatal: unable to access > 'https://gitlab.com/keycodemap/keycodemapdb.git/': Problem with the > SSL CA cert (path? access rights?) > fatal: clone of 'https://gitlab.com/keycodemap/keycodemapdb.git' into > submodule path 'ui/keycodemapdb' failed I'm not sure what I can do about this one - if GIT can't checkout a normal git repo, this looks like a OS distro / setup bug on the build host. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 12 October 2017 at 09:24, Daniel P. Berrange <berrange@redhat.com> wrote: > On Wed, Oct 11, 2017 at 05:45:04PM +0100, Peter Maydell wrote: >> $ ./scripts/git-submodule.sh update ui/keycodemapdb dtc >> Cloning into 'ui/keycodemapdb'... >> fatal: unable to access >> 'https://gitlab.com/keycodemap/keycodemapdb.git/': Problem with the >> SSL CA cert (path? access rights?) >> fatal: clone of 'https://gitlab.com/keycodemap/keycodemapdb.git' into >> submodule path 'ui/keycodemapdb' failed > > I'm not sure what I can do about this one - if GIT can't checkout > a normal git repo, this looks like a OS distro / setup bug on the > build host. Build system (which is a chroot) didn't have openssl or ca-certificates packages installed. That hasn't been a problem so far because we haven't used https:// for git previously. I've updated the packages on the build system, but it would be nice if we had a clearer error message when the problem is "we now depend on some packages that we didn't previously and so you should install them". thanks -- PMM
Hi, > > $ ./scripts/git-submodule.sh update ui/keycodemapdb dtc > > Cloning into 'ui/keycodemapdb'... > > fatal: unable to access > > 'https://gitlab.com/keycodemap/keycodemapdb.git/': Problem with the > > SSL CA cert (path? access rights?) > > fatal: clone of 'https://gitlab.com/keycodemap/keycodemapdb.git' > > into > > submodule path 'ui/keycodemapdb' failed > > I'm not sure what I can do about this one does gitlab support git:// urls too? > - if GIT can't checkout > a normal git repo, this looks like a OS distro / setup bug on the > build host. Indeed. Is this openbsd? They are a bit paranoid, possibly the usual ca bundle (from nss/mozilla IIRC) isn't installed by default. cheers, Gerd
On Thu, Oct 12, 2017 at 11:30:26AM +0200, Gerd Hoffmann wrote: > Hi, > > > > $ ./scripts/git-submodule.sh update ui/keycodemapdb dtc > > > Cloning into 'ui/keycodemapdb'... > > > fatal: unable to access > > > 'https://gitlab.com/keycodemap/keycodemapdb.git/': Problem with the > > > SSL CA cert (path? access rights?) > > > fatal: clone of 'https://gitlab.com/keycodemap/keycodemapdb.git' > > > into > > > submodule path 'ui/keycodemapdb' failed > > > > I'm not sure what I can do about this one > > does gitlab support git:// urls too? Not AFAICT - if i try it just never completes connect() Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Hi, > Not AFAICT - if i try it just never completes connect() Hmm, so maybe we should mirror the thing on git.qemu.org and use that? cheers, Gerd
On Thu, Oct 12, 2017 at 12:04:47PM +0200, Gerd Hoffmann wrote: > Hi, > > > Not AFAICT - if i try it just never completes connect() > > Hmm, so maybe we should mirror the thing on git.qemu.org and use that? Can that be made 100% automated - I don't want to have to push changes to two different git repos. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 12 October 2017 at 11:07, Daniel P. Berrange <berrange@redhat.com> wrote: > On Thu, Oct 12, 2017 at 12:04:47PM +0200, Gerd Hoffmann wrote: >> Hi, >> >> > Not AFAICT - if i try it just never completes connect() >> >> Hmm, so maybe we should mirror the thing on git.qemu.org and use that? > > Can that be made 100% automated - I don't want to have to push changes to > two different git repos. All our git.qemu.org mirrors are automated, I think (there's a cron job on the server somewhere that syncs them with the upstream, IIRC?) thanks -- PMM
On Thu, 2017-10-12 at 11:07 +0100, Daniel P. Berrange wrote: > On Thu, Oct 12, 2017 at 12:04:47PM +0200, Gerd Hoffmann wrote: > > Hi, > > > > > Not AFAICT - if i try it just never completes connect() > > > > Hmm, so maybe we should mirror the thing on git.qemu.org and use > > that? > > Can that be made 100% automated - I don't want to have to push > changes to > two different git repos. Yes, seabios works that way for example. cheers, Gerd
On Thu, Oct 12, 2017 at 12:13:23PM +0200, Gerd Hoffmann wrote: > On Thu, 2017-10-12 at 11:07 +0100, Daniel P. Berrange wrote: > > On Thu, Oct 12, 2017 at 12:04:47PM +0200, Gerd Hoffmann wrote: > > > Hi, > > > > > > > Not AFAICT - if i try it just never completes connect() > > > > > > Hmm, so maybe we should mirror the thing on git.qemu.org and use > > > that? > > > > Can that be made 100% automated - I don't want to have to push > > changes to > > two different git repos. > > Yes, seabios works that way for example. Ok, lets do that mirror then we can use git:// and we're consistent with other submodules we use Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 12 October 2017 at 10:30, Gerd Hoffmann <kraxel@redhat.com> wrote: > Indeed. Is this openbsd? They are a bit paranoid, possibly the usual > ca bundle (from nss/mozilla IIRC) isn't installed by default. No, it's an Ubuntu chroot. ca-certificates is "Priority: optional", so on a small thing like a chroot which only has a bare minimum set of packages needed for builds, it might not be present. thanks -- PMM
Hi, > FreeBSD: > > > CC ui/input-keymap.o > /root/qemu/ui/input-keymap.c:8:10: fatal error: > 'ui/input-keymap-linux-to-qcode.c' file not found > #include "ui/input-keymap-linux-to-qcode.c" > ^ scripts/git-modules.sh has no bashims, a simple s/bash/sh/ fixes the build on freebsd. cheers, Gerd
On Wed, 2017-10-11 at 15:37 +0100, Peter Maydell wrote: > On 11 October 2017 at 09:35, Gerd Hoffmann <kraxel@redhat.com> wrote: > > The following changes since commit > > 567d0a19c7998fa366598b83d5a6e5f0759d3ea9: > > > > Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and- > > machine-pull-request' into staging (2017-10-10 13:25:46 +0100) > > > > are available in the git repository at: > > > > git://git.kraxel.org/qemu tags/ui-20171011-pull-request > > > > for you to fetch changes up to > > 92328b7104ffc825f10c33f3fd1866e940a523f7: > > > > ui/gtk: Fix deprecation of vte_terminal_copy_clipboard (2017-10- > > 11 10:03:31 +0200) > > > > ---------------------------------------------------------------- > > 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 > > > > ---------------------------------------------------------------- > > Build failures: > > NetBSD: > CC ui/input-keymap.o > /root/qemu/ui/input-keymap.c:8:44: fatal error: > ui/input-keymap-linux-to-qcode.c: No such file or directory > #include "ui/input-keymap-linux-to-qcode.c" > ^ > > FreeBSD: > > > CC ui/input-keymap.o > /root/qemu/ui/input-keymap.c:8:10: fatal error: > 'ui/input-keymap-linux-to-qcode.c' file not found > #include "ui/input-keymap-linux-to-qcode.c" > ^ > > OpenBSD: > > gmake: Entering directory '/home/qemu/build/all' > /bin/sh: ./scripts/git-submodule.sh: No such file or directory > gmake: Leaving directory '/home/qemu/build/all' > gmake: Entering directory '/home/qemu/build/all' > GIT > /bin/sh: ./scripts/git-submodule.sh: No such file or directory > gmake: *** [Makefile:30: git-submodule-update] Error 1 > gmake: Leaving directory '/home/qemu/build/all' > gmake: *** Waiting for unfinished jobs.... > gmake: Entering directory '/home/qemu/build/all' > config-host.mak is out-of-date, running configure > Install prefix /usr/local > [configure output snipped] > gmake: Leaving directory '/home/qemu/build/all' > > AArch32 Linux: > > make: Entering directory '/home/peter.maydell/qemu/build/all-a32' > config-host.mak is out-of-date, running configure > Install prefix /usr/local > BIOS directory /usr/local/share/qemu > [...] > VxHS block device no > GEN config-host.h > GEN module_block.h > GEN ui/input-keymap-linux-to-qcode.c > GEN ui/input-keymap-qcode-to-qnum.c > GEN ui/input-keymap-qnum-to-qcode.c > GIT ui/keycodemapdb dtc > GEN trace/generated-tcg-tracers.h > GEN trace/generated-helpers-wrappers.h > GEN trace/generated-helpers.h > GEN trace/generated-helpers.c > Makefile:30: recipe for target 'git-submodule-update' failed > make: *** [git-submodule-update] Error 128 > make: *** Waiting for unfinished jobs.... > make: Leaving directory '/home/peter.maydell/qemu/build/all-a32' > > > The OpenBSD failure is because make now tries to run a > script that uses #!/bin/bash, and this machine doesn't > have bash installed. Do we really need to add bash to > our build-dependencies? The script doesn't seem like it's > doing anything that critically requires bash... > > thanks > -- PMM New pull out, with bash dropped, repo switched to qemu mirror and one additional gtk fix picked up from the list. cheers, Gerd
© 2016 - 2024 Red Hat, Inc.