Skip to contentSkip to conversation

keytable: meson: Restrict the installation of 50-rc_keymap.conf

PATCH Applied Fabio Estevam 2 participants 2 messages Jan 12, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 keytable: meson: Restrict the installation of 50-rc_keymap.conf

From: Fabio Estevam <[email protected]>

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.

---
 utils/keytable/meson.build | 4 ++++
 1 file changed, 4 insertions(+)
utils/keytable/meson.build +4 -0
index 4130a4bea514..76ce329eae8e 100644
@@ -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
Signature · 1 line
2.34.1
Applied
#1 lore raw
Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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.

Thanks, applied!

Sean

Quoted 30 lines
---
 utils/keytable/meson.build | 4 ++++
 1 file changed, 4 insertions(+)
utils/keytable/meson.build +4 -0
index 4130a4bea514..76ce329eae8e 100644
@@ -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
Signature · 1 line
2.34.1