Drop the udev hwdb model quirks

Replaced with the quirks files in merge commit 000ac14 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
gitclear · Jun 18, 2018 · 870ddce · 870ddce
1 parent a7d19e4
commit 870ddce
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 669 deletions.
diff --git a/meson.build b/meson.build
@@ -116,41 +116,20 @@ executable('libinput-model-quirks',
 	   install : true,
 	   install_dir : udev_dir)
 
-model_quirks = files('udev/90-libinput-model-quirks.hwdb')
-
-parse_hwdb_py = find_program('udev/parse_hwdb.py')
-test('parse-hwdb',
-     parse_hwdb_py,
-     args : model_quirks)
-
 udev_rules_config = configuration_data()
 udev_rules_config.set('UDEV_TEST_PATH', '')
 configure_file(input : 'udev/80-libinput-device-groups.rules.in',
 	       output : '80-libinput-device-groups.rules',
 	       install : true,
 	       install_dir : udev_rules_dir,
 	       configuration : udev_rules_config)
-configure_file(input : 'udev/90-libinput-model-quirks.rules.in',
-	       output : '90-libinput-model-quirks.rules',
-	       install : true,
-	       install_dir : udev_rules_dir,
-	       configuration : udev_rules_config)
-configure_file(input : model_quirks,
-	       output : '90-libinput-model-quirks.hwdb',
-	       install : true,
-	       install_dir : udev_hwdb_dir,
-	       configuration : udev_rules_config)
 
 litest_udev_rules_config = configuration_data()
 litest_udev_rules_config.set('UDEV_TEST_PATH', meson.build_root() + '/')
 litest_groups_rules_file = configure_file(input : 'udev/80-libinput-device-groups.rules.in',
 	       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)
 
 ############ libinput-util.a ############
 src_libinput_util = [
@@ -812,10 +791,6 @@ if get_option('tests')
 		       install : false,
 		       configuration : udev_rules_config)
 
-	config_h.set_quoted('LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE',
-			    join_paths(meson.build_root(), '90-libinput-model-quirks.rules'))
-	config_h.set_quoted('LIBINPUT_MODEL_QUIRKS_UDEV_HWDB_FILE',
-			    join_paths(meson.build_root(), '90-libinput-model-quirks.hwdb'))
 	config_h.set_quoted('LIBINPUT_TEST_DEVICE_RULES_FILE',
 			    join_paths(meson.build_root(), '80-libinput-test-device.rules'))
 	config_h.set_quoted('LIBINPUT_DEVICE_GROUPS_RULES_FILE',

diff --git a/test/litest.c b/test/litest.c
@@ -1185,16 +1185,6 @@ litest_install_model_quirks(struct list *created_files_list)
 			 "#################################################################\n\n";
 	struct created_file *file;
 
-	file = litest_copy_file(UDEV_MODEL_QUIRKS_RULE_FILE,
-				LIBINPUT_MODEL_QUIRKS_UDEV_RULES_FILE,
-				warning);
-	list_insert(created_files_list, &file->link);
-
-	file = litest_copy_file(UDEV_MODEL_QUIRKS_HWDB_FILE,
-				LIBINPUT_MODEL_QUIRKS_UDEV_HWDB_FILE,
-				warning);
-	list_insert(created_files_list, &file->link);
-
 	file = litest_copy_file(UDEV_TEST_DEVICE_RULE_FILE,
 				LIBINPUT_TEST_DEVICE_RULES_FILE,
 				warning);