From: Fabio Estevam <festevam@gmail.com>
To: hverkuil-cisco@xs4all.nl
Cc: sean@mess.org, raj.khem@gmail.com, linux-media@vger.kernel.org,
Fabio Estevam <festevam@denx.de>
Subject: [PATCH v4l-utils] keytable: meson: Restrict the installation of 50-rc_keymap.conf
Date: Fri, 12 Jan 2024 00:17:14 -0300 [thread overview]
Message-ID: <20240112031714.242522-1-festevam@gmail.com> (raw)
From: Fabio Estevam <festevam@denx.de>
Currently, meson tries to install 50-rc_keymap.conf even if systemd
is not used.
Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"),
only allowed 50-rc_keymap.conf to be installed when both BPF and systemd
were used.
Apply the same logic in meson to fix the problem.
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
utils/keytable/meson.build | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
index 4130a4bea514..76ce329eae8e 100644
--- a/utils/keytable/meson.build
+++ b/utils/keytable/meson.build
@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files(
install_data(ir_keytable_udev_rules,
install_dir : ir_keytable_system_dir / 'rules.d')
+if ir_bpf_enabled
+if dep_systemd.found()
if have_udevdsyscallfilter
ir_keytable_systemd_files = files(
'50-rc_keymap.conf',
@@ -76,6 +78,8 @@ if have_udevdsyscallfilter
install_data(ir_keytable_systemd_files,
install_dir : systemd_systemdir / 'systemd-udevd.service.d')
endif
+endif
+endif
# Install non-existing directory to create empty directory structure
# See: https://github.com/mesonbuild/meson/issues/2904
--
2.34.1
next reply other threads:[~2024-01-12 3:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-12 3:17 Fabio Estevam [this message]
2024-01-12 8:52 ` [PATCH v4l-utils] keytable: meson: Restrict the installation of 50-rc_keymap.conf Sean Young
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240112031714.242522-1-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=festevam@denx.de \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=raj.khem@gmail.com \
--cc=sean@mess.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox