summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch')
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
deleted file mode 100644
index 64c01e4977..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001
2From: Fabio Estevam <festevam@denx.de>
3Date: Fri, 12 Jan 2024 00:17:14 -0300
4Subject: [PATCH] keytable: meson: Restrict the installation of
5 50-rc_keymap.conf
6
7Currently, meson tries to install 50-rc_keymap.conf even if systemd
8is not used.
9
10Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"),
11only allowed 50-rc_keymap.conf to be installed when both BPF and systemd
12were used.
13
14Apply the same logic in meson to fix the problem.
15
16Signed-off-by: Fabio Estevam <festevam@denx.de>
17Signed-off-by: Sean Young <sean@mess.org>
18Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168]
19---
20 utils/keytable/meson.build | 4 ++++
21 1 file changed, 4 insertions(+)
22
23diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
24index 4130a4bea514..76ce329eae8e 100644
25--- a/utils/keytable/meson.build
26+++ b/utils/keytable/meson.build
27@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files(
28 install_data(ir_keytable_udev_rules,
29 install_dir : ir_keytable_system_dir / 'rules.d')
30
31+if ir_bpf_enabled
32+if dep_systemd.found()
33 if have_udevdsyscallfilter
34 ir_keytable_systemd_files = files(
35 '50-rc_keymap.conf',
36@@ -76,6 +78,8 @@ if have_udevdsyscallfilter
37 install_data(ir_keytable_systemd_files,
38 install_dir : systemd_systemdir / 'systemd-udevd.service.d')
39 endif
40+endif
41+endif
42
43 # Install non-existing directory to create empty directory structure
44 # See: https://github.com/mesonbuild/meson/issues/2904
45--
462.34.1