Re: [PATCH V2] meson: install keyboard maps only if necessary

[Carlos Santos]

On Mon, Mar 27, 2023 at 6:25 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Sun, Mar 26, 2023 at 06:17:00PM -0300, casantos@redhat.com wrote:
> > From: Carlos Santos <casantos@redhat.com>
> >
> > They are required only for system emulation (i.e. have_system is true).
> >
> > Signed-off-by: Carlos Santos <casantos@redhat.com>
> > ---
> >  pc-bios/keymaps/meson.build   | 6 ++++--
> >  tests/fp/berkeley-testfloat-3 | 2 +-
> >  ui/keycodemapdb               | 2 +-
>
> This still has the accidental git submodule updates included
>
> >  3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
> > index 158a3b410c..bff3083313 100644
> > --- a/pc-bios/keymaps/meson.build
> > +++ b/pc-bios/keymaps/meson.build
> > @@ -47,7 +47,7 @@ if native_qemu_keymap.found()
> >                         build_by_default: true,
> >                         output: km,
> >                         command: [native_qemu_keymap, '-f', '@OUTPUT@', 
> > args.split()],
> > -                       install: true,
> > +                       install: have_system,
> >                         install_dir: qemu_datadir / 'keymaps')
> >    endforeach
> >
> > @@ -56,4 +56,6 @@ else
> >    install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps')
> >  endif
> >
> > -install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
> > +if have_system
> > +  install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps')
> > +endif
> > diff --git a/tests/fp/berkeley-testfloat-3 b/tests/fp/berkeley-testfloat-3
> > index 40619cbb3b..5a59dcec19 160000
> > --- a/tests/fp/berkeley-testfloat-3
> > +++ b/tests/fp/berkeley-testfloat-3
> > @@ -1 +1 @@
> > -Subproject commit 40619cbb3bf32872df8c53cc457039229428a263
> > +Subproject commit 5a59dcec19327396a011a17fd924aed4fec416b3
> > diff --git a/ui/keycodemapdb b/ui/keycodemapdb
> > index f5772a62ec..d21009b1c9 160000
> > --- a/ui/keycodemapdb
> > +++ b/ui/keycodemapdb
> > @@ -1 +1 @@
> > -Subproject commit f5772a62ec52591ff6870b7e8ef32482371f22c6
> > +Subproject commit d21009b1c9f94b740ea66be8e48a1d8ad8124023
> > --
> > 2.31.1

I submitted an updated patch. Thanks.

-- 
Carlos Santos
Senior Software Maintenance Engineer
Red Hat
casantos@redhat.com    T: +55-11-3534-6186