package/qemu: install keyboard maps only if necessary

From: Carlos Santos <unixmania@gmail.com>

They are required only for system emulation, so pull a patch already
reviewd upstream[1,2] that makes the installation conditional.

1. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06428.html
2. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06438.html

Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
 ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch

Hi Carlos,

On 09/04/2023 02:09, unixmania@gmail.com wrote:
> From: Carlos Santos <unixmania@gmail.com>
> 
> They are required only for system emulation, so pull a patch already
> reviewd upstream[1,2] that makes the installation conditional.
> 
> 1. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06428.html
> 2. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06438.html
> 
> Signed-off-by: Carlos Santos <unixmania@gmail.com>
> ---
>   ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++
>   1 file changed, 36 insertions(+)
>   create mode 100644 package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> 
> diff --git a/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> new file mode 100644
> index 0000000000..91ea1e86c9
> --- /dev/null
> +++ b/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> @@ -0,0 +1,36 @@
> +From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001
> +From: Carlos Santos <casantos@redhat.com>
> +Date: Sun, 1 Jan 2023 21:00:57 -0300
> +Subject: [PATCH] meson: install keyboard maps only if necessary
> +
> +They are required only for system emulation (i.e. have_system is true).
> +
> +Signed-off-by: Carlos Santos <casantos@redhat.com>

  We need the SoB for unixmania@gmail.com on this. The SoB is a short way for 
you (the private person, not the Redhat employee) to assert that you are 
entitled to contribute the patch under qemu's license.

  Also, please link to the upstream patchwork entry here, like this:

Upstream: 
https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/


  Regards,
  Arnout

> +---
> + pc-bios/keymaps/meson.build | 6 ++++--
> + 1 file changed, 4 insertions(+), 2 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
> +--
> +2.31.1
> +

On Mon, Apr 10, 2023 at 11:57 AM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>   Hi Carlos,
>
> On 09/04/2023 02:09, unixmania@gmail.com wrote:
> > From: Carlos Santos <unixmania@gmail.com>
> >
> > They are required only for system emulation, so pull a patch already
> > reviewd upstream[1,2] that makes the installation conditional.
> >
> > 1. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06428.html
> > 2. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06438.html
> >
> > Signed-off-by: Carlos Santos <unixmania@gmail.com>
> > ---
> >   ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++
> >   1 file changed, 36 insertions(+)
> >   create mode 100644 package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> >
> > diff --git a/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> > new file mode 100644
> > index 0000000000..91ea1e86c9
> > --- /dev/null
> > +++ b/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> > @@ -0,0 +1,36 @@
> > +From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001
> > +From: Carlos Santos <casantos@redhat.com>
> > +Date: Sun, 1 Jan 2023 21:00:57 -0300
> > +Subject: [PATCH] meson: install keyboard maps only if necessary
> > +
> > +They are required only for system emulation (i.e. have_system is true).
> > +
> > +Signed-off-by: Carlos Santos <casantos@redhat.com>
>
>   We need the SoB for unixmania@gmail.com on this. The SoB is a short way for
> you (the private person, not the Redhat employee) to assert that you are
> entitled to contribute the patch under qemu's license.

Thousands of Red Hat employees contribute to free software projects
using their work email addresses. There is no contradiction between
personal and employee activity regarding this. Check this document for
additional information:

   Red Hat’s open source participation guidelines
   https://www.redhat.com/en/resources/open-source-participation-guidelines-overview

>   Also, please link to the upstream patchwork entry here, like this:
>
> Upstream:
> https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/

This makes sense. I will update the commit message to fix the link.

Hello,

On Tue, Apr 11, 2023 at 11:41 AM Carlos Santos <unixmania@gmail.com> wrote:
>
> On Mon, Apr 10, 2023 at 11:57 AM Arnout Vandecappelle <arnout@mind.be> wrote:
> >
> >   Hi Carlos,
> >
> > On 09/04/2023 02:09, unixmania@gmail.com wrote:
> > > From: Carlos Santos <unixmania@gmail.com>
> > >
> > > They are required only for system emulation, so pull a patch already
> > > reviewd upstream[1,2] that makes the installation conditional.
> > >
> > > 1. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06428.html
> > > 2. https://lists.gnu.org/archive/html/qemu-devel/2023-03/msg06438.html
> > >
> > > Signed-off-by: Carlos Santos <unixmania@gmail.com>
> > > ---
> > >   ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++
> > >   1 file changed, 36 insertions(+)
> > >   create mode 100644 package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> > >
> > > diff --git a/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> > > new file mode 100644
> > > index 0000000000..91ea1e86c9
> > > --- /dev/null
> > > +++ b/package/qemu/0004-meson-install-keyboard-maps-only-if-necessary.patch
> > > @@ -0,0 +1,36 @@
> > > +From 9d9b74f806f5dbca53df6630c1a0591eaedd4500 Mon Sep 17 00:00:00 2001
> > > +From: Carlos Santos <casantos@redhat.com>
> > > +Date: Sun, 1 Jan 2023 21:00:57 -0300
> > > +Subject: [PATCH] meson: install keyboard maps only if necessary
> > > +
> > > +They are required only for system emulation (i.e. have_system is true).
> > > +
> > > +Signed-off-by: Carlos Santos <casantos@redhat.com>
> >
> >   We need the SoB for unixmania@gmail.com on this. The SoB is a short way for
> > you (the private person, not the Redhat employee) to assert that you are
> > entitled to contribute the patch under qemu's license.
>
> Thousands of Red Hat employees contribute to free software projects
> using their work email addresses. There is no contradiction between
> personal and employee activity regarding this. Check this document for
> additional information:
>
>    Red Hat’s open source participation guidelines
>    https://www.redhat.com/en/resources/open-source-participation-guidelines-overview
>
> >   Also, please link to the upstream patchwork entry here, like this:
> >
> > Upstream:
> > https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/
>
> This makes sense. I will update the commit message to fix the link.
>
> --
> Carlos Santos <unixmania@gmail.com>

I sent an updated patch:

    https://patchwork.ozlabs.org/project/buildroot/patch/20230523231645.33886-1-unixmania@gmail.com/