Skip to contentSkip to conversation

ui: move 'pc-bios/keymaps' to 'ui/keymaps'

PATCH In review Daniel P. Berrangé 2 participants 2 messages Jun 13, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ui: move 'pc-bios/keymaps' to 'ui/keymaps'

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.

---

Changed in v2:

- Make configure symlink ui/keymaps to $BUILD/pc-bios so in-tree build execution works. (Thanks Volker)

 configure                           | 4 ++++
 pc-bios/meson.build                 | 1 -
 {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, 5 insertions(+), 1 deletion(-)
 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%)
configure +4 -0
index e69537c756..77c6864251 100755
@@ -2226,6 +2226,10 @@ for f in $LINKS ; do
     fi
 done
 
+# Keymaps needs slightly different location in build
+# dir as we are simulating the installed data dir layout
+symlink "$source_path/ui/keymaps" "pc-bios/keymaps"
+
 # Mac OS X ships with a broken assembler
 roms=
 probe_target_compilers i386 x86_64
pc-bios/meson.build +0 -1
index 41ba1c0ec7..e49c0e5f56 100644
@@ -97,4 +97,3 @@ foreach f : blobs
 endforeach
 
 subdir('descriptors')
-subdir('keymaps')
ui/keymaps/ar renamed from pc-bios/keymaps/ar +0 -0
similarity index 100%
rename from pc-bios/keymaps/ar
rename to ui/keymaps/ar
ui/keymaps/bepo renamed from pc-bios/keymaps/bepo +0 -0
similarity index 100%
rename from pc-bios/keymaps/bepo
rename to ui/keymaps/bepo
ui/keymaps/cz renamed from pc-bios/keymaps/cz +0 -0
similarity index 100%
rename from pc-bios/keymaps/cz
rename to ui/keymaps/cz
ui/keymaps/da renamed from pc-bios/keymaps/da +0 -0
similarity index 100%
rename from pc-bios/keymaps/da
rename to ui/keymaps/da
ui/keymaps/de renamed from pc-bios/keymaps/de +0 -0
similarity index 100%
rename from pc-bios/keymaps/de
rename to ui/keymaps/de
ui/keymaps/de-ch renamed from pc-bios/keymaps/de-ch +0 -0
similarity index 100%
rename from pc-bios/keymaps/de-ch
rename to ui/keymaps/de-ch
ui/keymaps/en-gb renamed from pc-bios/keymaps/en-gb +0 -0
similarity index 100%
rename from pc-bios/keymaps/en-gb
rename to ui/keymaps/en-gb
ui/keymaps/en-us renamed from pc-bios/keymaps/en-us +0 -0
similarity index 100%
rename from pc-bios/keymaps/en-us
rename to ui/keymaps/en-us
ui/keymaps/es renamed from pc-bios/keymaps/es +0 -0
similarity index 100%
rename from pc-bios/keymaps/es
rename to ui/keymaps/es
ui/keymaps/et renamed from pc-bios/keymaps/et +0 -0
similarity index 100%
rename from pc-bios/keymaps/et
rename to ui/keymaps/et
ui/keymaps/fi renamed from pc-bios/keymaps/fi +0 -0
similarity index 100%
rename from pc-bios/keymaps/fi
rename to ui/keymaps/fi
ui/keymaps/fo renamed from pc-bios/keymaps/fo +0 -0
similarity index 100%
rename from pc-bios/keymaps/fo
rename to ui/keymaps/fo
ui/keymaps/fr renamed from pc-bios/keymaps/fr +0 -0
similarity index 100%
rename from pc-bios/keymaps/fr
rename to ui/keymaps/fr
ui/keymaps/fr-be renamed from pc-bios/keymaps/fr-be +0 -0
similarity index 100%
rename from pc-bios/keymaps/fr-be
rename to ui/keymaps/fr-be
ui/keymaps/fr-ca renamed from pc-bios/keymaps/fr-ca +0 -0
similarity index 100%
rename from pc-bios/keymaps/fr-ca
rename to ui/keymaps/fr-ca
ui/keymaps/fr-ch renamed from pc-bios/keymaps/fr-ch +0 -0
similarity index 100%
rename from pc-bios/keymaps/fr-ch
rename to ui/keymaps/fr-ch
ui/keymaps/hr renamed from pc-bios/keymaps/hr +0 -0
similarity index 100%
rename from pc-bios/keymaps/hr
rename to ui/keymaps/hr
ui/keymaps/hu renamed from pc-bios/keymaps/hu +0 -0
similarity index 100%
rename from pc-bios/keymaps/hu
rename to ui/keymaps/hu
ui/keymaps/is renamed from pc-bios/keymaps/is +0 -0
similarity index 100%
rename from pc-bios/keymaps/is
rename to ui/keymaps/is
ui/keymaps/it renamed from pc-bios/keymaps/it +0 -0
similarity index 100%
rename from pc-bios/keymaps/it
rename to ui/keymaps/it
ui/keymaps/ja renamed from pc-bios/keymaps/ja +0 -0
similarity index 100%
rename from pc-bios/keymaps/ja
rename to ui/keymaps/ja
ui/keymaps/lt renamed from pc-bios/keymaps/lt +0 -0
similarity index 100%
rename from pc-bios/keymaps/lt
rename to ui/keymaps/lt
ui/keymaps/lv renamed from pc-bios/keymaps/lv +0 -0
similarity index 100%
rename from pc-bios/keymaps/lv
rename to ui/keymaps/lv
ui/keymaps/meson.build renamed from pc-bios/keymaps/meson.build +0 -0
similarity index 100%
rename from pc-bios/keymaps/meson.build
rename to ui/keymaps/meson.build
ui/keymaps/mk renamed from pc-bios/keymaps/mk +0 -0
similarity index 100%
rename from pc-bios/keymaps/mk
rename to ui/keymaps/mk
ui/keymaps/nl renamed from pc-bios/keymaps/nl +0 -0
similarity index 100%
rename from pc-bios/keymaps/nl
rename to ui/keymaps/nl
ui/keymaps/no renamed from pc-bios/keymaps/no +0 -0
similarity index 100%
rename from pc-bios/keymaps/no
rename to ui/keymaps/no
ui/keymaps/pl renamed from pc-bios/keymaps/pl +0 -0
similarity index 100%
rename from pc-bios/keymaps/pl
rename to ui/keymaps/pl
ui/keymaps/pt renamed from pc-bios/keymaps/pt +0 -0
similarity index 100%
rename from pc-bios/keymaps/pt
rename to ui/keymaps/pt
ui/keymaps/pt-br renamed from pc-bios/keymaps/pt-br +0 -0
similarity index 100%
rename from pc-bios/keymaps/pt-br
rename to ui/keymaps/pt-br
ui/keymaps/ru renamed from pc-bios/keymaps/ru +0 -0
similarity index 100%
rename from pc-bios/keymaps/ru
rename to ui/keymaps/ru
ui/keymaps/sl renamed from pc-bios/keymaps/sl +0 -0
similarity index 100%
rename from pc-bios/keymaps/sl
rename to ui/keymaps/sl
ui/keymaps/sv renamed from pc-bios/keymaps/sv +0 -0
similarity index 100%
rename from pc-bios/keymaps/sv
rename to ui/keymaps/sv
ui/keymaps/th renamed from pc-bios/keymaps/th +0 -0
similarity index 100%
rename from pc-bios/keymaps/th
rename to ui/keymaps/th
ui/keymaps/tr renamed from pc-bios/keymaps/tr +0 -0
similarity index 100%
rename from pc-bios/keymaps/tr
rename to ui/keymaps/tr
ui/meson.build +1 -0
index e9f48c5315..25c9a5ff8c 100644
@@ -170,6 +170,7 @@ if have_system or xkbcommon.found()
 endif
 
 subdir('shader')
+subdir('keymaps')
 
 if have_system
   subdir('icons')
Signature · 1 line
2.36.1
#1 lore raw
Quoted 10 lines · Daniel P. Berrangé

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.

Quoted 7 lines

---

Changed in v2:

- Make configure symlink ui/keymaps to $BUILD/pc-bios so in-tree build execution works. (Thanks Volker)

Replaced patch, v2 pull req sent.

thanks,
Gerd