1b1e1b0071
I was seeing failures on vnc-display-test on FreeBSD: make vm-build-freebsd V=1 TARGET_LIST=aarch64-softmmu BUILD_TARGET=check-qtest QEMU_LOCAL=1 DEBUG=1 Leads to: qemu-system-aarch64: -vnc none: could not read keymap file: 'en-us' Broken pipe ../src/tests/qtest/libqtest.c:196: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0) which was as far as I could tell because we don't populate the $BLD/pc-bios/keymaps (although scripts/symlink-install-tree.py attempts to symlink qemu-bundle/usr/local/share/qemu/keymaps/ to that dir). Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20250108121054.1126164-31-alex.bennee@linaro.org>
61 lines
1.5 KiB
Meson
61 lines
1.5 KiB
Meson
keymaps = {
|
|
'ar': '-l ara',
|
|
'bepo': '-l fr -v dvorak',
|
|
'cz': '-l cz',
|
|
'da': '-l dk',
|
|
'de': '-l de -v nodeadkeys',
|
|
'de-ch': '-l ch',
|
|
'en-gb': '-l gb',
|
|
'en-us': '-l us',
|
|
'es': '-l es',
|
|
'et': '-l et',
|
|
'fi': '-l fi',
|
|
'fo': '-l fo',
|
|
'fr': '-l fr -v nodeadkeys',
|
|
'fr-be': '-l be',
|
|
'fr-ca': '-l ca -v fr',
|
|
'fr-ch': '-l ch -v fr',
|
|
'hr': '-l hr',
|
|
'hu': '-l hu',
|
|
'is': '-l is',
|
|
'it': '-l it',
|
|
'ja': '-l jp -m jp106',
|
|
'lt': '-l lt',
|
|
'lv': '-l lv',
|
|
'mk': '-l mk',
|
|
'nl': '-l nl',
|
|
'no': '-l no',
|
|
'pl': '-l pl',
|
|
'pt': '-l pt',
|
|
'pt-br': '-l br',
|
|
'ru': '-l ru',
|
|
'th': '-l th',
|
|
'tr': '-l tr',
|
|
}
|
|
|
|
if meson.is_cross_build() or not xkbcommon.found()
|
|
native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true)
|
|
else
|
|
native_qemu_keymap = qemu_keymap
|
|
endif
|
|
|
|
keymap_targets = []
|
|
if native_qemu_keymap.found()
|
|
foreach km, args: keymaps
|
|
# generate with qemu-kvm
|
|
keymap_targets += custom_target(km,
|
|
build_by_default: true,
|
|
output: km,
|
|
command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
|
|
install: have_system,
|
|
install_dir: qemu_datadir / 'keymaps')
|
|
endforeach
|
|
alias_target('update-keymaps', keymap_targets)
|
|
else
|
|
install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
|
|
endif
|
|
|
|
if have_system
|
|
install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
|
|
endif
|