Commit e65392c2 authored by Peter Hutterer's avatar Peter Hutterer
Browse files

udev: rename libinput-model-quirks rules to libinput-fuzz-override.rules



Because these days, that's all it does
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent d6c07503
...@@ -149,8 +149,8 @@ executable('libinput-device-group', ...@@ -149,8 +149,8 @@ executable('libinput-device-group',
include_directories : [includes_src, includes_include], include_directories : [includes_src, includes_include],
install : true, install : true,
install_dir : dir_udev_callouts) install_dir : dir_udev_callouts)
executable('libinput-model-quirks', executable('libinput-fuzz-override',
'udev/libinput-model-quirks.c', 'udev/libinput-fuzz-override.c',
dependencies : [dep_udev, dep_libevdev], dependencies : [dep_udev, dep_libevdev],
include_directories : [includes_src, includes_include], include_directories : [includes_src, includes_include],
install : true, install : true,
...@@ -163,8 +163,8 @@ configure_file(input : 'udev/80-libinput-device-groups.rules.in', ...@@ -163,8 +163,8 @@ configure_file(input : 'udev/80-libinput-device-groups.rules.in',
install : true, install : true,
install_dir : dir_udev_rules, install_dir : dir_udev_rules,
configuration : udev_rules_config) configuration : udev_rules_config)
configure_file(input : 'udev/90-libinput-model-quirks.rules.in', configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
output : '90-libinput-model-quirks.rules', output : '90-libinput-fuzz-override.rules',
install : true, install : true,
install_dir : dir_udev_rules, install_dir : dir_udev_rules,
configuration : udev_rules_config) configuration : udev_rules_config)
...@@ -175,8 +175,8 @@ litest_groups_rules_file = configure_file(input : 'udev/80-libinput-device-group ...@@ -175,8 +175,8 @@ litest_groups_rules_file = configure_file(input : 'udev/80-libinput-device-group
output : '80-libinput-device-groups-litest.rules', output : '80-libinput-device-groups-litest.rules',
install : false, install : false,
configuration : litest_udev_rules_config) configuration : litest_udev_rules_config)
litest_model_quirks_file = configure_file(input : 'udev/90-libinput-model-quirks.rules.in', litest_fuzz_override_file = configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
output : '90-libinput-model-quirks-litest.rules', output : '90-libinput-fuzz-override-litest.rules',
install : false, install : false,
configuration : litest_udev_rules_config) configuration : litest_udev_rules_config)
...@@ -798,8 +798,8 @@ if get_option('tests') ...@@ -798,8 +798,8 @@ if get_option('tests')
litest_config_h = configuration_data() litest_config_h = configuration_data()
litest_config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE', litest_config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE',
join_paths(meson.build_root(), '80-libinput-device-groups.rules')) join_paths(meson.build_root(), '80-libinput-device-groups.rules'))
litest_config_h.set_quoted('LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE', litest_config_h.set_quoted('LIBINPUT_FUZZ_OVERRIDE_UDEV_RULES_FILE',
join_paths(meson.build_root(), '90-libinput-model-quirks.rules')) join_paths(meson.build_root(), '90-libinput-fuzz-override.rules'))
def_no_main = '-DLITEST_NO_MAIN' def_no_main = '-DLITEST_NO_MAIN'
def_disable_backtrace = '-DLITEST_DISABLE_BACKTRACE_LOGGING' def_disable_backtrace = '-DLITEST_DISABLE_BACKTRACE_LOGGING'
......
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
#define UDEV_RULES_D "/run/udev/rules.d" #define UDEV_RULES_D "/run/udev/rules.d"
#define UDEV_RULE_PREFIX "99-litest-" #define UDEV_RULE_PREFIX "99-litest-"
#define UDEV_MODEL_QUIRKS_RULE_FILE UDEV_RULES_D \ #define UDEV_FUZZ_OVERRIDE_RULE_FILE UDEV_RULES_D \
"/91-litest-model-quirks-REMOVEME-XXXXXX.rules" "/91-litest-fuzz-override-REMOVEME-XXXXXX.rules"
#define UDEV_TEST_DEVICE_RULE_FILE UDEV_RULES_D \ #define UDEV_TEST_DEVICE_RULE_FILE UDEV_RULES_D \
"/91-litest-test-device-REMOVEME-XXXXXXX.rules" "/91-litest-test-device-REMOVEME-XXXXXXX.rules"
#define UDEV_DEVICE_GROUPS_FILE UDEV_RULES_D \ #define UDEV_DEVICE_GROUPS_FILE UDEV_RULES_D \
...@@ -1241,8 +1241,8 @@ litest_install_model_quirks(struct list *created_files_list) ...@@ -1241,8 +1241,8 @@ litest_install_model_quirks(struct list *created_files_list)
true); true);
list_insert(created_files_list, &file->link); list_insert(created_files_list, &file->link);
file = litest_copy_file(UDEV_MODEL_QUIRKS_RULE_FILE, file = litest_copy_file(UDEV_FUZZ_OVERRIDE_RULE_FILE,
LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE, LIBINPUT_FUZZ_OVERRIDE_UDEV_RULES_FILE,
warning, warning,
true); true);
list_insert(created_files_list, &file->link); list_insert(created_files_list, &file->link);
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
# This file contains lookup rules for libinput model-specific quirks. # This file contains lookup rules for libinput model-specific quirks.
# IT IS NOT A STABLE API AND SUBJECT TO CHANGE AT ANY TIME # IT IS NOT A STABLE API AND SUBJECT TO CHANGE AT ANY TIME
ACTION!="add|change", GOTO="libinput_model_quirks_end" ACTION!="add|change", GOTO="libinput_fuzz_override_end"
KERNEL!="event*", GOTO="libinput_model_quirks_end" KERNEL!="event*", GOTO="libinput_fuzz_override_end"
ATTRS{capabilities/abs}!="0", IMPORT{program}="@UDEV_TEST_PATH@libinput-model-quirks %S%p" ATTRS{capabilities/abs}!="0", IMPORT{program}="@UDEV_TEST_PATH@libinput-fuzz-override %S%p"
LABEL="libinput_model_quirks_end" LABEL="libinput_model_quirks_end"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment