Ping, any thoughts on this ? On Tue, Apr 26, 2022 at 05:01:50PM +0100, Daniel P. Berrangé wrote: > 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. This install time arrangement > does not need to be reflected in the source tree arrangement. These > keymaps logically belong with the UI code. > > Signed-off-by: Daniel P. Berrangé <[email protected]> > --- > 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 + > 37 files changed, 1 insertion(+), 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%) > > diff --git a/pc-bios/meson.build b/pc-bios/meson.build > index c86dedf7df..8c7caa0164 100644 > --- a/pc-bios/meson.build > +++ b/pc-bios/meson.build > @@ -90,4 +90,3 @@ if get_option('install_blobs') > endif > > subdir('descriptors') > -subdir('keymaps') > diff --git a/pc-bios/keymaps/ar b/ui/keymaps/ar > similarity index 100% > rename from pc-bios/keymaps/ar > rename to ui/keymaps/ar > diff --git a/pc-bios/keymaps/bepo b/ui/keymaps/bepo > similarity index 100% > rename from pc-bios/keymaps/bepo > rename to ui/keymaps/bepo > diff --git a/pc-bios/keymaps/cz b/ui/keymaps/cz > similarity index 100% > rename from pc-bios/keymaps/cz > rename to ui/keymaps/cz > diff --git a/pc-bios/keymaps/da b/ui/keymaps/da > similarity index 100% > rename from pc-bios/keymaps/da > rename to ui/keymaps/da > diff --git a/pc-bios/keymaps/de b/ui/keymaps/de > similarity index 100% > rename from pc-bios/keymaps/de > rename to ui/keymaps/de > diff --git a/pc-bios/keymaps/de-ch b/ui/keymaps/de-ch > similarity index 100% > rename from pc-bios/keymaps/de-ch > rename to ui/keymaps/de-ch > diff --git a/pc-bios/keymaps/en-gb b/ui/keymaps/en-gb > similarity index 100% > rename from pc-bios/keymaps/en-gb > rename to ui/keymaps/en-gb > diff --git a/pc-bios/keymaps/en-us b/ui/keymaps/en-us > similarity index 100% > rename from pc-bios/keymaps/en-us > rename to ui/keymaps/en-us > diff --git a/pc-bios/keymaps/es b/ui/keymaps/es > similarity index 100% > rename from pc-bios/keymaps/es > rename to ui/keymaps/es > diff --git a/pc-bios/keymaps/et b/ui/keymaps/et > similarity index 100% > rename from pc-bios/keymaps/et > rename to ui/keymaps/et > diff --git a/pc-bios/keymaps/fi b/ui/keymaps/fi > similarity index 100% > rename from pc-bios/keymaps/fi > rename to ui/keymaps/fi > diff --git a/pc-bios/keymaps/fo b/ui/keymaps/fo > similarity index 100% > rename from pc-bios/keymaps/fo > rename to ui/keymaps/fo > diff --git a/pc-bios/keymaps/fr b/ui/keymaps/fr > similarity index 100% > rename from pc-bios/keymaps/fr > rename to ui/keymaps/fr > diff --git a/pc-bios/keymaps/fr-be b/ui/keymaps/fr-be > similarity index 100% > rename from pc-bios/keymaps/fr-be > rename to ui/keymaps/fr-be > diff --git a/pc-bios/keymaps/fr-ca b/ui/keymaps/fr-ca > similarity index 100% > rename from pc-bios/keymaps/fr-ca > rename to ui/keymaps/fr-ca > diff --git a/pc-bios/keymaps/fr-ch b/ui/keymaps/fr-ch > similarity index 100% > rename from pc-bios/keymaps/fr-ch > rename to ui/keymaps/fr-ch > diff --git a/pc-bios/keymaps/hr b/ui/keymaps/hr > similarity index 100% > rename from pc-bios/keymaps/hr > rename to ui/keymaps/hr > diff --git a/pc-bios/keymaps/hu b/ui/keymaps/hu > similarity index 100% > rename from pc-bios/keymaps/hu > rename to ui/keymaps/hu > diff --git a/pc-bios/keymaps/is b/ui/keymaps/is > similarity index 100% > rename from pc-bios/keymaps/is > rename to ui/keymaps/is > diff --git a/pc-bios/keymaps/it b/ui/keymaps/it > similarity index 100% > rename from pc-bios/keymaps/it > rename to ui/keymaps/it > diff --git a/pc-bios/keymaps/ja b/ui/keymaps/ja > similarity index 100% > rename from pc-bios/keymaps/ja > rename to ui/keymaps/ja > diff --git a/pc-bios/keymaps/lt b/ui/keymaps/lt > similarity index 100% > rename from pc-bios/keymaps/lt > rename to ui/keymaps/lt > diff --git a/pc-bios/keymaps/lv b/ui/keymaps/lv > similarity index 100% > rename from pc-bios/keymaps/lv > rename to ui/keymaps/lv > diff --git a/pc-bios/keymaps/meson.build b/ui/keymaps/meson.build > similarity index 100% > rename from pc-bios/keymaps/meson.build > rename to ui/keymaps/meson.build > diff --git a/pc-bios/keymaps/mk b/ui/keymaps/mk > similarity index 100% > rename from pc-bios/keymaps/mk > rename to ui/keymaps/mk > diff --git a/pc-bios/keymaps/nl b/ui/keymaps/nl > similarity index 100% > rename from pc-bios/keymaps/nl > rename to ui/keymaps/nl > diff --git a/pc-bios/keymaps/no b/ui/keymaps/no > similarity index 100% > rename from pc-bios/keymaps/no > rename to ui/keymaps/no > diff --git a/pc-bios/keymaps/pl b/ui/keymaps/pl > similarity index 100% > rename from pc-bios/keymaps/pl > rename to ui/keymaps/pl > diff --git a/pc-bios/keymaps/pt b/ui/keymaps/pt > similarity index 100% > rename from pc-bios/keymaps/pt > rename to ui/keymaps/pt > diff --git a/pc-bios/keymaps/pt-br b/ui/keymaps/pt-br > similarity index 100% > rename from pc-bios/keymaps/pt-br > rename to ui/keymaps/pt-br > diff --git a/pc-bios/keymaps/ru b/ui/keymaps/ru > similarity index 100% > rename from pc-bios/keymaps/ru > rename to ui/keymaps/ru > diff --git a/pc-bios/keymaps/sl b/ui/keymaps/sl > similarity index 100% > rename from pc-bios/keymaps/sl > rename to ui/keymaps/sl > diff --git a/pc-bios/keymaps/sv b/ui/keymaps/sv > similarity index 100% > rename from pc-bios/keymaps/sv > rename to ui/keymaps/sv > diff --git a/pc-bios/keymaps/th b/ui/keymaps/th > similarity index 100% > rename from pc-bios/keymaps/th > rename to ui/keymaps/th > diff --git a/pc-bios/keymaps/tr b/ui/keymaps/tr > similarity index 100% > rename from pc-bios/keymaps/tr > rename to ui/keymaps/tr > diff --git a/ui/meson.build b/ui/meson.build > index 64286ba150..dc44610abb 100644 > --- a/ui/meson.build > +++ b/ui/meson.build > @@ -169,6 +169,7 @@ if have_system or xkbcommon.found() > endif > > subdir('shader') > +subdir('keymaps') > > if have_system > subdir('icons') > -- > 2.35.1 >
With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
