From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 26 Jun 2019 01:29:31 +0000 (+1000)
Subject: udev: rename libinput-model-quirks rules to libinput-fuzz-override.rules
X-Git-Tag: 1.13.901~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e65392c2f5c926de748bf66481155baefec30f11;p=platform%2Fupstream%2Flibinput.git

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

Because these days, that's all it does

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/meson.build b/meson.build
index b908a14..e2af8a5 100644
--- a/meson.build
+++ b/meson.build
@@ -149,8 +149,8 @@ executable('libinput-device-group',
 	   include_directories : [includes_src, includes_include],
 	   install : true,
 	   install_dir : dir_udev_callouts)
-executable('libinput-model-quirks',
-	   'udev/libinput-model-quirks.c',
+executable('libinput-fuzz-override',
+	   'udev/libinput-fuzz-override.c',
 	   dependencies : [dep_udev, dep_libevdev],
 	   include_directories : [includes_src, includes_include],
 	   install : true,
@@ -163,11 +163,11 @@ configure_file(input : 'udev/80-libinput-device-groups.rules.in',
 	       install : true,
 	       install_dir : dir_udev_rules,
 	       configuration : udev_rules_config)
-configure_file(input : 'udev/90-libinput-model-quirks.rules.in',
-              output : '90-libinput-model-quirks.rules',
-              install : true,
-              install_dir : dir_udev_rules,
-              configuration : udev_rules_config)
+configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
+	       output : '90-libinput-fuzz-override.rules',
+	       install : true,
+	       install_dir : dir_udev_rules,
+	       configuration : udev_rules_config)
 
 litest_udev_rules_config = configuration_data()
 litest_udev_rules_config.set('UDEV_TEST_PATH', meson.build_root() + '/')
@@ -175,10 +175,10 @@ litest_groups_rules_file = configure_file(input : 'udev/80-libinput-device-group
 	       output : '80-libinput-device-groups-litest.rules',
 	       install : false,
 	       configuration : litest_udev_rules_config)
-litest_model_quirks_file = configure_file(input : 'udev/90-libinput-model-quirks.rules.in',
-					  output : '90-libinput-model-quirks-litest.rules',
-					  install : false,
-					  configuration : litest_udev_rules_config)
+litest_fuzz_override_file = configure_file(input : 'udev/90-libinput-fuzz-override.rules.in',
+					   output : '90-libinput-fuzz-override-litest.rules',
+					   install : false,
+					   configuration : litest_udev_rules_config)
 
 ############ libepoll-shim (BSD) ############
 
@@ -798,8 +798,8 @@ if get_option('tests')
 	litest_config_h = configuration_data()
 	litest_config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE',
 			    join_paths(meson.build_root(), '80-libinput-device-groups.rules'))
-	litest_config_h.set_quoted('LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE',
-			    join_paths(meson.build_root(), '90-libinput-model-quirks.rules'))
+	litest_config_h.set_quoted('LIBINPUT_FUZZ_OVERRIDE_UDEV_RULES_FILE',
+			    join_paths(meson.build_root(), '90-libinput-fuzz-override.rules'))
 
 	def_no_main = '-DLITEST_NO_MAIN'
 	def_disable_backtrace = '-DLITEST_DISABLE_BACKTRACE_LOGGING'
diff --git a/test/litest.c b/test/litest.c
index ab5a73a..d6852a1 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -66,8 +66,8 @@
 
 #define UDEV_RULES_D "/run/udev/rules.d"
 #define UDEV_RULE_PREFIX "99-litest-"
-#define UDEV_MODEL_QUIRKS_RULE_FILE UDEV_RULES_D \
-	"/91-litest-model-quirks-REMOVEME-XXXXXX.rules"
+#define UDEV_FUZZ_OVERRIDE_RULE_FILE UDEV_RULES_D \
+	"/91-litest-fuzz-override-REMOVEME-XXXXXX.rules"
 #define UDEV_TEST_DEVICE_RULE_FILE UDEV_RULES_D \
 	"/91-litest-test-device-REMOVEME-XXXXXXX.rules"
 #define UDEV_DEVICE_GROUPS_FILE UDEV_RULES_D \
@@ -1241,8 +1241,8 @@ litest_install_model_quirks(struct list *created_files_list)
 				true);
 	list_insert(created_files_list, &file->link);
 
-	file = litest_copy_file(UDEV_MODEL_QUIRKS_RULE_FILE,
-				LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE,
+	file = litest_copy_file(UDEV_FUZZ_OVERRIDE_RULE_FILE,
+				LIBINPUT_FUZZ_OVERRIDE_UDEV_RULES_FILE,
 				warning,
 				true);
 	list_insert(created_files_list, &file->link);
diff --git a/udev/90-libinput-model-quirks.rules.in b/udev/90-libinput-fuzz-override.rules.in
similarity index 68%
rename from udev/90-libinput-model-quirks.rules.in
rename to udev/90-libinput-fuzz-override.rules.in
index e0e83f8..84ad26b 100644
--- a/udev/90-libinput-model-quirks.rules.in
+++ b/udev/90-libinput-fuzz-override.rules.in
@@ -3,10 +3,10 @@
 # This file contains lookup rules for libinput model-specific quirks.
 # IT IS NOT A STABLE API AND SUBJECT TO CHANGE AT ANY TIME
 
-ACTION!="add|change", GOTO="libinput_model_quirks_end"
-KERNEL!="event*", GOTO="libinput_model_quirks_end"
+ACTION!="add|change", GOTO="libinput_fuzz_override_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"
 
diff --git a/udev/libinput-model-quirks.c b/udev/libinput-fuzz-override.c
similarity index 100%
rename from udev/libinput-model-quirks.c
rename to udev/libinput-fuzz-override.c