[PATCH] meson: fix installation of keymaps

Anthony PERARD via posted 1 patch 3 years, 7 months ago
Test docker-quick@centos7 failed
Test docker-mingw@fedora failed
Test checkpatch failed
Test FreeBSD failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200918130354.1879275-1-anthony.perard@citrix.com
pc-bios/keymaps/meson.build | 2 ++
1 file changed, 2 insertions(+)
[PATCH] meson: fix installation of keymaps
Posted by Anthony PERARD via 3 years, 7 months ago
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

---
I don't know much about meson, but without "install:true" to the
custom_target(), the keymaps files doen't get install when running
`make install`. Only the files "sl" and "sv" are installed.
So "install:true" seems necessary here.

I've tried both with and without `qemu-keymap` (or xkbcommon).
---
 pc-bios/keymaps/meson.build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
index 2e2e0dfa3b79..05eda6c0d26d 100644
--- a/pc-bios/keymaps/meson.build
+++ b/pc-bios/keymaps/meson.build
@@ -47,6 +47,7 @@ foreach km, args: keymaps
                        build_by_default: true,
                        output: km,
                        command: [native_qemu_keymap, '-f', '@OUTPUT@', args.split()],
+                       install: true,
                        install_dir: qemu_datadir / 'keymaps')
   else
     # copy from source tree
@@ -55,6 +56,7 @@ foreach km, args: keymaps
                        input: km,
                        output: km,
                        command: ['cp', '@INPUT@', '@OUTPUT@'],
+                       install: true,
                        install_dir: qemu_datadir / 'keymaps')
   endif
 endforeach
-- 
Anthony PERARD


Re: [PATCH] meson: fix installation of keymaps
Posted by no-reply@patchew.org 3 years, 7 months ago
Patchew URL: https://patchew.org/QEMU/20200918130354.1879275-1-anthony.perard@citrix.com/



Hi,

This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.






The full log is available at
http://patchew.org/logs/20200918130354.1879275-1-anthony.perard@citrix.com/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com