USB-Audio: use conf.d/

Change relative paths to absolute.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Dell/Desktop-Front.conf b/ucm2/USB-Audio/Dell/Desktop-Front.conf
index 6e2cd344390ab8f9c98810b6176ea8afb4fe1241..d5c439ca6efe5294f2b24b774bb66d948e833ce0 100644 (file)
--- a/ucm2/USB-Audio/Dell/Desktop-Front.conf
+++ b/ucm2/USB-Audio/Dell/Desktop-Front.conf
@@ -2,5 +2,5 @@ Syntax 2
 Comment "USB-audio on the front of Dell Desktop"
 SectionUseCase."HiFi" {
        Comment "Internal Speaker/Front Headset"
-       File "Dell/Desktop-Front-Speaker-Headset.conf"
+       File "/USB-Audio/Dell/Desktop-Front-Speaker-Headset.conf"
 }

diff --git a/ucm2/USB-Audio/Dell/Desktop-Rear.conf b/ucm2/USB-Audio/Dell/Desktop-Rear.conf
index 7df353b118760b263fc148ab8c9bf24bc32cb72d..0237379b0b894bfa1258f935cf8ef421020acab2 100644 (file)
--- a/ucm2/USB-Audio/Dell/Desktop-Rear.conf
+++ b/ucm2/USB-Audio/Dell/Desktop-Rear.conf
@@ -2,5 +2,5 @@ Syntax 2
 Comment "USB-audio on the rear of Dell Desktop"
 SectionUseCase."Line" {
        Comment "Line Out"
-       File "Dell/Desktop-Rear-Line.conf"
+       File "/USB-Audio/Dell/Desktop-Rear-Line.conf"
 }

diff --git a/ucm2/USB-Audio/Dell/WD15-Dock.conf b/ucm2/USB-Audio/Dell/WD15-Dock.conf
index 682ff41fdb2087a198c16a65169a9bb8b9c2fc30..33874e958a69aa25d56a0fd7d33c2326749f3976 100644 (file)
--- a/ucm2/USB-Audio/Dell/WD15-Dock.conf
+++ b/ucm2/USB-Audio/Dell/WD15-Dock.conf
@@ -1,6 +1,6 @@
 Syntax 2
 Comment "USB-audio on Dell WD15 docking station"
 SectionUseCase."HiFi" {
-       File "Dell/WD15-Dock-HiFi.conf"
+       File "/USB-Audio/Dell/WD15-Dock-HiFi.conf"
        Comment "Default"
 }

diff --git a/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf b/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf
index 2895f9e47b0aaca6d4fd5c8dc31fce1883719c4f..8f073c67d176609339bc5607ab3dc19df08e5532 100644 (file)
--- a/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf
+++ b/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf
@@ -1,5 +1,5 @@
 Comment "Gigabyte Aorus Integrated Audio"
 SectionUseCase."HiFi" {
-       File "Gigabyte/Aorus-Master-Main-Audio-HiFi.conf"
+       File "/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf"
        Comment "Default Alsa Profile"
 }

diff --git a/ucm2/USB-Audio/GoXLR/GoXLR.conf b/ucm2/USB-Audio/GoXLR/GoXLR.conf
index 700aaf8c7dc19b347fb07b57d75a5518cad74c04..557bfae9bd9c20ba294558f0063a52c13b860ac8 100644 (file)
--- a/ucm2/USB-Audio/GoXLR/GoXLR.conf
+++ b/ucm2/USB-Audio/GoXLR/GoXLR.conf
@@ -1,5 +1,5 @@
 Comment "GoXLR USB-Audio"
 SectionUseCase."HiFi" {
        Comment "Default Alsa Profile"
-       File "GoXLR/GoXLR-HiFi.conf"
+       File "/USB-Audio/GoXLR/GoXLR-HiFi.conf"
 }

diff --git a/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf
index f4d8f48d03a61740d712347a21c6f8b9e3728adb..815a9c281442cf23490907e37fefc254981b8c4c 100644 (file)
--- a/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf
+++ b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf
@@ -1,5 +1,5 @@
 Comment "USB-audio on Lenovo ThinkStation P620 Main Audio"
 SectionUseCase."HiFi" {
        Comment "Default"
-       File "Lenovo/ThinkStation-P620-Main-HiFi.conf"
+       File "/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf"
 }

diff --git a/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf
index 7229c6de68ac39c3e5a571ccdb18512f943f5225..371c1d8c6ea21353cc0b7fd6147583f0d0ea8453 100644 (file)
--- a/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf
+++ b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf
@@ -1,5 +1,5 @@
 Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio"
 SectionUseCase."HiFi" {
        Comment "Default"
-       File "Lenovo/ThinkStation-P620-Rear-HiFi.conf"
+       File "/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf"
 }

diff --git a/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf b/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf
index 485f7cb0d485e21b5258f59cfab5981b4d24fd1f..afb349572c91dd5efb31c37c01a173f67c118565 100644 (file)
--- a/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf
+++ b/ucm2/USB-Audio/Realtek/ALC1220-VB-Desktop.conf
@@ -1,5 +1,5 @@
 Comment "USB-audio on Realtek ALC1220-VB desktop"
 SectionUseCase."HiFi" {
-       File "Realtek/ALC1220-VB-Desktop-HiFi.conf"
+       File "/USB-Audio/Realtek/ALC1220-VB-Desktop-HiFi.conf"
        Comment "Default Alsa Profile"
 }

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index bd8e82a3509a413a1ca716da3e1828c40270a381..878d16d21223d5fc6a3bc59e7ddcf6c39603698a 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -97,5 +97,5 @@ If.inc {
                Empty "${var:ProfileName}"
        }
        True.Error "UCM is not supported for this USB device (${CardLongName} @ ${CardComponents})"
-       False.Include.prof.File "${var:ProfileName}.conf"
+       False.Include.prof.File "/USB-Audio/${var:ProfileName}.conf"
 }

diff --git a/ucm2/conf.d/USB-Audio/USB-Audio.conf b/ucm2/conf.d/USB-Audio/USB-Audio.conf
new file mode 120000 (symlink)
index 0000000..bb29ced
--- /dev/null
+++ b/ucm2/conf.d/USB-Audio/USB-Audio.conf
@@ -0,0 +1 @@
+../../USB-Audio/USB-Audio.conf
\ No newline at end of file