@@ -97,4 +97,3 @@ foreach f : blobs
endforeach
subdir('descriptors')
-subdir('keymaps')
@@ -62,7 +62,7 @@ char *qemu_find_file(int type, const char *name)
case QEMU_FILE_TYPE_KEYMAP:
user_install_dir = user_data_dir;
rel_install_dir = "keymaps";
- rel_build_dir = "pc-bios/keymaps";
+ rel_build_dir = "ui/keymaps";
default_install_dir = default_data_dir;
break;
similarity index 100%
rename from pc-bios/keymaps/ar
rename to ui/keymaps/ar
similarity index 100%
rename from pc-bios/keymaps/bepo
rename to ui/keymaps/bepo
similarity index 100%
rename from pc-bios/keymaps/cz
rename to ui/keymaps/cz
similarity index 100%
rename from pc-bios/keymaps/da
rename to ui/keymaps/da
similarity index 100%
rename from pc-bios/keymaps/de
rename to ui/keymaps/de
similarity index 100%
rename from pc-bios/keymaps/de-ch
rename to ui/keymaps/de-ch
similarity index 100%
rename from pc-bios/keymaps/en-gb
rename to ui/keymaps/en-gb
similarity index 100%
rename from pc-bios/keymaps/en-us
rename to ui/keymaps/en-us
similarity index 100%
rename from pc-bios/keymaps/es
rename to ui/keymaps/es
similarity index 100%
rename from pc-bios/keymaps/et
rename to ui/keymaps/et
similarity index 100%
rename from pc-bios/keymaps/fi
rename to ui/keymaps/fi
similarity index 100%
rename from pc-bios/keymaps/fo
rename to ui/keymaps/fo
similarity index 100%
rename from pc-bios/keymaps/fr
rename to ui/keymaps/fr
similarity index 100%
rename from pc-bios/keymaps/fr-be
rename to ui/keymaps/fr-be
similarity index 100%
rename from pc-bios/keymaps/fr-ca
rename to ui/keymaps/fr-ca
similarity index 100%
rename from pc-bios/keymaps/fr-ch
rename to ui/keymaps/fr-ch
similarity index 100%
rename from pc-bios/keymaps/hr
rename to ui/keymaps/hr
similarity index 100%
rename from pc-bios/keymaps/hu
rename to ui/keymaps/hu
similarity index 100%
rename from pc-bios/keymaps/is
rename to ui/keymaps/is
similarity index 100%
rename from pc-bios/keymaps/it
rename to ui/keymaps/it
similarity index 100%
rename from pc-bios/keymaps/ja
rename to ui/keymaps/ja
similarity index 100%
rename from pc-bios/keymaps/lt
rename to ui/keymaps/lt
similarity index 100%
rename from pc-bios/keymaps/lv
rename to ui/keymaps/lv
similarity index 100%
rename from pc-bios/keymaps/meson.build
rename to ui/keymaps/meson.build
similarity index 100%
rename from pc-bios/keymaps/mk
rename to ui/keymaps/mk
similarity index 100%
rename from pc-bios/keymaps/nl
rename to ui/keymaps/nl
similarity index 100%
rename from pc-bios/keymaps/no
rename to ui/keymaps/no
similarity index 100%
rename from pc-bios/keymaps/pl
rename to ui/keymaps/pl
similarity index 100%
rename from pc-bios/keymaps/pt
rename to ui/keymaps/pt
similarity index 100%
rename from pc-bios/keymaps/pt-br
rename to ui/keymaps/pt-br
similarity index 100%
rename from pc-bios/keymaps/ru
rename to ui/keymaps/ru
similarity index 100%
rename from pc-bios/keymaps/sl
rename to ui/keymaps/sl
similarity index 100%
rename from pc-bios/keymaps/sv
rename to ui/keymaps/sv
similarity index 100%
rename from pc-bios/keymaps/th
rename to ui/keymaps/th
similarity index 100%
rename from pc-bios/keymaps/tr
rename to ui/keymaps/tr
@@ -170,6 +170,7 @@ if have_system or xkbcommon.found()
endif
subdir('shader')
+subdir('keymaps')
if have_system
subdir('icons')
The 'keymaps' directory contents is nothing to do with the firmware blobs. The 'pc-bios/keymaps' directory appears to have been used previously as a convenience for getting the files installed into a subdir of the firmware install dir, as well as to make it easier to launch QEMU directly from the build tree. These requirements do not need to be reflected in the source tree arrangement. The keymaps logically belong with the UI code, and meson can install them into the right place. For in-tree execution, we merely need a suitable symlink from the source tree to the build tree. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- pc-bios/meson.build | 1 - softmmu/datadir.c | 2 +- {pc-bios => ui}/keymaps/ar | 0 {pc-bios => ui}/keymaps/bepo | 0 {pc-bios => ui}/keymaps/cz | 0 {pc-bios => ui}/keymaps/da | 0 {pc-bios => ui}/keymaps/de | 0 {pc-bios => ui}/keymaps/de-ch | 0 {pc-bios => ui}/keymaps/en-gb | 0 {pc-bios => ui}/keymaps/en-us | 0 {pc-bios => ui}/keymaps/es | 0 {pc-bios => ui}/keymaps/et | 0 {pc-bios => ui}/keymaps/fi | 0 {pc-bios => ui}/keymaps/fo | 0 {pc-bios => ui}/keymaps/fr | 0 {pc-bios => ui}/keymaps/fr-be | 0 {pc-bios => ui}/keymaps/fr-ca | 0 {pc-bios => ui}/keymaps/fr-ch | 0 {pc-bios => ui}/keymaps/hr | 0 {pc-bios => ui}/keymaps/hu | 0 {pc-bios => ui}/keymaps/is | 0 {pc-bios => ui}/keymaps/it | 0 {pc-bios => ui}/keymaps/ja | 0 {pc-bios => ui}/keymaps/lt | 0 {pc-bios => ui}/keymaps/lv | 0 {pc-bios => ui}/keymaps/meson.build | 0 {pc-bios => ui}/keymaps/mk | 0 {pc-bios => ui}/keymaps/nl | 0 {pc-bios => ui}/keymaps/no | 0 {pc-bios => ui}/keymaps/pl | 0 {pc-bios => ui}/keymaps/pt | 0 {pc-bios => ui}/keymaps/pt-br | 0 {pc-bios => ui}/keymaps/ru | 0 {pc-bios => ui}/keymaps/sl | 0 {pc-bios => ui}/keymaps/sv | 0 {pc-bios => ui}/keymaps/th | 0 {pc-bios => ui}/keymaps/tr | 0 ui/meson.build | 1 + 38 files changed, 2 insertions(+), 2 deletions(-) rename {pc-bios => ui}/keymaps/ar (100%) rename {pc-bios => ui}/keymaps/bepo (100%) rename {pc-bios => ui}/keymaps/cz (100%) rename {pc-bios => ui}/keymaps/da (100%) rename {pc-bios => ui}/keymaps/de (100%) rename {pc-bios => ui}/keymaps/de-ch (100%) rename {pc-bios => ui}/keymaps/en-gb (100%) rename {pc-bios => ui}/keymaps/en-us (100%) rename {pc-bios => ui}/keymaps/es (100%) rename {pc-bios => ui}/keymaps/et (100%) rename {pc-bios => ui}/keymaps/fi (100%) rename {pc-bios => ui}/keymaps/fo (100%) rename {pc-bios => ui}/keymaps/fr (100%) rename {pc-bios => ui}/keymaps/fr-be (100%) rename {pc-bios => ui}/keymaps/fr-ca (100%) rename {pc-bios => ui}/keymaps/fr-ch (100%) rename {pc-bios => ui}/keymaps/hr (100%) rename {pc-bios => ui}/keymaps/hu (100%) rename {pc-bios => ui}/keymaps/is (100%) rename {pc-bios => ui}/keymaps/it (100%) rename {pc-bios => ui}/keymaps/ja (100%) rename {pc-bios => ui}/keymaps/lt (100%) rename {pc-bios => ui}/keymaps/lv (100%) rename {pc-bios => ui}/keymaps/meson.build (100%) rename {pc-bios => ui}/keymaps/mk (100%) rename {pc-bios => ui}/keymaps/nl (100%) rename {pc-bios => ui}/keymaps/no (100%) rename {pc-bios => ui}/keymaps/pl (100%) rename {pc-bios => ui}/keymaps/pt (100%) rename {pc-bios => ui}/keymaps/pt-br (100%) rename {pc-bios => ui}/keymaps/ru (100%) rename {pc-bios => ui}/keymaps/sl (100%) rename {pc-bios => ui}/keymaps/sv (100%) rename {pc-bios => ui}/keymaps/th (100%) rename {pc-bios => ui}/keymaps/tr (100%)