From b900fe6b4e6162fc82d303dbb6dd0cde403e2dae Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Wed, 5 Sep 2018 07:55:18 -0500
Subject: [PATCH] trivial: move all Dell dock related quirks into dell.quirk

These quirks aren't really needed if compiled without the Dell plugin
since they just set the parentage.
---
 plugins/dell/dell.quirk                 | 31 +++++++++++++++++++++++++
 plugins/synapticsmst/synapticsmst.quirk | 21 -----------------
 plugins/thunderbolt/meson.build         |  4 ----
 plugins/thunderbolt/thunderbolt.quirk   |  9 -------
 4 files changed, 31 insertions(+), 34 deletions(-)
 delete mode 100644 plugins/thunderbolt/thunderbolt.quirk

diff --git a/plugins/dell/dell.quirk b/plugins/dell/dell.quirk
index a76f4da2e..d6c1c43f6 100644
--- a/plugins/dell/dell.quirk
+++ b/plugins/dell/dell.quirk
@@ -2,6 +2,37 @@
 [DeviceInstanceId=USB\VID_0BDA&PID_8153]
 Plugin = dell
 
+# Dell TB16/TB18 cable
+[Guid=TBT-00d4b051]
+Plugin = thunderbolt
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+
+# Dell TB16/TB18 dock
+[Guid=TBT-00d4b054]
+Plugin = thunderbolt
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+
+# Dell WD15 dock
+[Guid=MST-wd15-vmm3332-274]
+Plugin = synapticsmst
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+
+# Dell TB16 dock
+[Guid=MST-tb16-vmm3320-274]
+Plugin = synapticsmst
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+[Guid=MST-tb16-vmm3330-274]
+Plugin = synapticsmst
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+
+#Dell TB18 dock
+[Guid=MST-tb18-vmm3320-274]
+Plugin = synapticsmst
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+[Guid=MST-tb18-vmm3330-274]
+Plugin = synapticsmst
+ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
+
 [SmbiosManufacturer=Dell Inc.]
 UefiVersionFormat = quad
 
diff --git a/plugins/synapticsmst/synapticsmst.quirk b/plugins/synapticsmst/synapticsmst.quirk
index e12a549c2..d3f8fa488 100644
--- a/plugins/synapticsmst/synapticsmst.quirk
+++ b/plugins/synapticsmst/synapticsmst.quirk
@@ -38,24 +38,3 @@ DeviceKind = wld15
 [SynapticsMSTBoardID=277]
 Name = Dell Rugged Platform
 DeviceKind = system
-
-# Dell WD15 dock
-[Guid=MST-wd15-vmm3332-274]
-Plugin = synapticsmst
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
-
-# Dell TB16 dock
-[Guid=MST-tb16-vmm3320-274]
-Plugin = synapticsmst
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
-[Guid=MST-tb16-vmm3330-274]
-Plugin = synapticsmst
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
-
-#Dell TB18 dock
-[Guid=MST-tb18-vmm3320-274]
-Plugin = synapticsmst
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
-[Guid=MST-tb18-vmm3330-274]
-Plugin = synapticsmst
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
index 82820de8d..17e81b73e 100644
--- a/plugins/thunderbolt/meson.build
+++ b/plugins/thunderbolt/meson.build
@@ -1,9 +1,5 @@
 cargs = ['-DG_LOG_DOMAIN="FuPluginThunderbolt"']
 
-install_data(['thunderbolt.quirk'],
-  install_dir: join_paths(datadir, 'fwupd', 'quirks.d')
-)
-
 fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
   sources : [
     'fu-plugin-thunderbolt.c',
diff --git a/plugins/thunderbolt/thunderbolt.quirk b/plugins/thunderbolt/thunderbolt.quirk
deleted file mode 100644
index 8e864266e..000000000
--- a/plugins/thunderbolt/thunderbolt.quirk
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dell TB16/TB18 cable
-[Guid=TBT-00d4b051]
-Plugin = thunderbolt
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479
-
-# Dell TB16/TB18 dock
-[Guid=TBT-00d4b054]
-Plugin = thunderbolt
-ParentGuid = e7ca1f36-bf73-4574-afe6-a4ccacabf479