diff mbox series

[v2] package/qemu: install keyboard maps only if necessary

Message ID 20230523231645.33886-1-unixmania@gmail.com
State Superseded
Headers show
Series [v2] package/qemu: install keyboard maps only if necessary | expand

Commit Message

Carlos Santos May 23, 2023, 11:16 p.m. UTC
From: Carlos Santos <unixmania@gmail.com>

They are required only for system emulation, so pull a patch already
reviewd upstream that makes the installation conditional:

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

Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Changes v1->v2
  - Fixed reference to uptream patch, using the QEMU patchwork

Note about the "Signed-off-by: Carlos Santos <casantos@redhat.com>" in
the patch:

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
---
 ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch

Comments

Yann E. MORIN May 24, 2023, 4:26 a.m. UTC | #1
Carlos, All,

On 2023-05-23 20:16 -0300, unixmania@gmail.com spake thusly:
> From: Carlos Santos <unixmania@gmail.com>
> 
> They are required only for system emulation, so pull a patch already
> reviewd upstream that makes the installation conditional:
> 
>     https://patchwork.kernel.org/project/qemu-devel/patch/20230327172147.196607-1-casantos@redhat.com/
> 
> Signed-off-by: Carlos Santos <unixmania@gmail.com>
> ---
> Changes v1->v2
>   - Fixed reference to uptream patch, using the QEMU patchwork
> 
> Note about the "Signed-off-by: Carlos Santos <casantos@redhat.com>" in
> the patch:
> 
> 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

Still, it is our policy in Buildroot that the submitter adds its own SoB
when they carry a patch. In this case, the author casantos@redhat.com is
not the same (legally) as the submitter unixmania@gmail.com: the former
is a Red Hat employee, the latter is an individual acting in their own
name.

Please, add your unixmania@gmail.com SoB to the patch you add, as Arnout
requested.

Regards,
Yann E. MORIN.

> ---
>  ...tall-keyboard-maps-only-if-necessary.patch | 36 +++++++++++++++++++
>  1 file changed, 36 insertions(+)
>  create mode 100644 package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch
> 
> diff --git a/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch
> new file mode 100644
> index 0000000000..91ea1e86c9
> --- /dev/null
> +++ b/package/qemu/0003-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>
> +---
> + 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
> +
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch b/package/qemu/0003-meson-install-keyboard-maps-only-if-necessary.patch
new file mode 100644
index 0000000000..91ea1e86c9
--- /dev/null
+++ b/package/qemu/0003-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>
+---
+ 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
+