Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
meson: fix keymaps without qemu-keymap
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 ddcf607 ("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>
Message-Id: <20200827102617.14448-1-kraxel@redhat.com>
[thuth: Rebased, changed "config_host['qemu_datadir']" to "qemu_datadir",
        added Gerd's UNLINK fix to configure script]
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
kraxel authored and huth committed Sep 3, 2020
1 parent 45f7b7b commit 09db9b9
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 9 deletions.
9 changes: 9 additions & 0 deletions configure
Expand Up @@ -8065,6 +8065,9 @@ fi
# so the build tree will be missing the link back to the new file, and
# tests might fail. Prefer to keep the relevant files in their own
# directory and symlink the directory instead.
# UNLINK is used to remove symlinks from older development versions
# that might get into the way when doing "git update" without doing
# a "make distclean" in between.
DIRS="tests tests/tcg tests/tcg/lm32 tests/qapi-schema tests/qtest/libqos"
DIRS="$DIRS tests/qtest tests/qemu-iotests tests/vm tests/fp tests/qgraph"
DIRS="$DIRS docs docs/interop fsdev scsi"
Expand All @@ -8081,6 +8084,7 @@ LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
LINKS="$LINKS tests/acceptance tests/data"
LINKS="$LINKS tests/qemu-iotests/check"
LINKS="$LINKS python"
UNLINK="pc-bios/keymaps"
for bios_file in \
$source_path/pc-bios/*.bin \
$source_path/pc-bios/*.elf \
Expand All @@ -8101,6 +8105,11 @@ for f in $LINKS ; do
symlink "$source_path/$f" "$f"
fi
done
for f in $UNLINK ; do
if [ -L "$f" ]; then
rm -f "$f"
fi
done

(for i in $cross_cc_vars; do
export $i
Expand Down
28 changes: 19 additions & 9 deletions pc-bios/keymaps/meson.build
Expand Up @@ -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: 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: 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: 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: qemu_datadir / 'keymaps')
endif

install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')

0 comments on commit 09db9b9

Please sign in to comment.