| Message ID | 20200827102617.14448-1-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | meson: fix keymaps witout qemu-keymap | expand |
On 27/08/2020 12.26, Gerd Hoffmann wrote: > In case the qemu-keymap tool generating them is neither installed on the > system nor built from sources (due to xkbcommon not being available) > qemu will not find the keymaps when started directly from the build > tree, > > This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink") > removed the symlink to the source tree, and the special handling for > install doesn't help in case we do not install qemu. > > Lets fix that by simply copying over the file from the source tree as > fallback. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > pc-bios/keymaps/meson.build | 28 +++++++++++++++++++--------- > 1 file changed, 19 insertions(+), 9 deletions(-) Thanks, this fixes the acceptance tests on gitlab-CI for me! Tested-by: Thomas Huth <thuth@redhat.com>
Typo "without" in subject. Le lun. 31 août 2020 13:15, Thomas Huth <thuth@redhat.com> a écrit : > On 27/08/2020 12.26, Gerd Hoffmann wrote: > > In case the qemu-keymap tool generating them is neither installed on the > > system nor built from sources (due to xkbcommon not being available) > > qemu will not find the keymaps when started directly from the build > > tree, > > > > This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink") > > removed the symlink to the source tree, and the special handling for > > install doesn't help in case we do not install qemu. > > > > Lets fix that by simply copying over the file from the source tree as > > fallback. > > > > Reported-by: Thomas Huth <thuth@redhat.com> > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > --- > > pc-bios/keymaps/meson.build | 28 +++++++++++++++++++--------- > > 1 file changed, 19 insertions(+), 9 deletions(-) > > Thanks, this fixes the acceptance tests on gitlab-CI for me! > > Tested-by: Thomas Huth <thuth@redhat.com> > > > <div dir="auto"><div>Typo "without" in subject. <br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le lun. 31 août 2020 13:15, Thomas Huth <<a href="mailto:thuth@redhat.com">thuth@redhat.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 27/08/2020 12.26, Gerd Hoffmann wrote:<br> > In case the qemu-keymap tool generating them is neither installed on the<br> > system nor built from sources (due to xkbcommon not being available)<br> > qemu will not find the keymaps when started directly from the build<br> > tree,<br> > <br> > This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink")<br> > removed the symlink to the source tree, and the special handling for<br> > install doesn't help in case we do not install qemu.<br> > <br> > Lets fix that by simply copying over the file from the source tree as<br> > fallback.<br> > <br> > Reported-by: Thomas Huth <<a href="mailto:thuth@redhat.com" target="_blank" rel="noreferrer">thuth@redhat.com</a>><br> > Signed-off-by: Gerd Hoffmann <<a href="mailto:kraxel@redhat.com" target="_blank" rel="noreferrer">kraxel@redhat.com</a>><br> > ---<br> > pc-bios/keymaps/meson.build | 28 +++++++++++++++++++---------<br> > 1 file changed, 19 insertions(+), 9 deletions(-)<br> <br> Thanks, this fixes the acceptance tests on gitlab-CI for me!<br> <br> Tested-by: Thomas Huth <<a href="mailto:thuth@redhat.com" target="_blank" rel="noreferrer">thuth@redhat.com</a>><br> <br> <br> </blockquote></div></div></div>
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c8223031..e102dd56b454 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -38,19 +38,29 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host else native_qemu_keymap = qemu_keymap endif + t = [] foreach km, args: keymaps - t += custom_target(km, - build_by_default: true, - output: km, - command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], - install_dir: config_host['qemu_datadir'] / 'keymaps') + if native_qemu_keymap.found() + # generate with qemu-kvm + t += custom_target(km, + build_by_default: true, + output: km, + command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()], + install_dir: config_host['qemu_datadir'] / 'keymaps') + else + # copy from source tree + t += custom_target(km, + build_by_default: true, + input: km, + output: km, + command: ['cp', '@INPUT@', '@OUTPUT@'], + install_dir: config_host['qemu_datadir'] / 'keymaps') + endif endforeach -if t.length() > 0 + +if native_qemu_keymap.found() alias_target('update-keymaps', t) -else - # install from the source tree - install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / 'keymaps') endif install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'keymaps')
In case the qemu-keymap tool generating them is neither installed on the system nor built from sources (due to xkbcommon not being available) qemu will not find the keymaps when started directly from the build tree, This happens because commit ddcf607fa3d6 ("meson: drop keymaps symlink") removed the symlink to the source tree, and the special handling for install doesn't help in case we do not install qemu. Lets fix that by simply copying over the file from the source tree as fallback. Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- pc-bios/keymaps/meson.build | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)