|
Jaroslav Kysela |
401ece |
From 93e03bdc2a3dcd5d12516f5de78e14d88a32ff2c Mon Sep 17 00:00:00 2001
|
|
Jaroslav Kysela |
401ece |
From: Jaroslav Kysela <perex@perex.cz>
|
|
Jaroslav Kysela |
401ece |
Date: Wed, 4 Apr 2018 09:58:12 +0200
|
|
Jaroslav Kysela |
401ece |
Subject: [PATCH 1/2] alsa.conf: change the location for add-on configs to
|
|
Jaroslav Kysela |
401ece |
/etc/alsa/conf.d
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
The add-on configuration files should be placed to a volatile place.
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
Jaroslav Kysela |
401ece |
---
|
|
Jaroslav Kysela |
401ece |
src/conf/alsa.conf | 8 +-------
|
|
Jaroslav Kysela |
401ece |
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
|
|
Jaroslav Kysela |
401ece |
index f22918fb..bb00ff40 100644
|
|
Jaroslav Kysela |
401ece |
--- a/src/conf/alsa.conf
|
|
Jaroslav Kysela |
401ece |
+++ b/src/conf/alsa.conf
|
|
Jaroslav Kysela |
401ece |
@@ -8,13 +8,7 @@
|
|
Jaroslav Kysela |
401ece |
{
|
|
Jaroslav Kysela |
401ece |
func load
|
|
Jaroslav Kysela |
401ece |
files [
|
|
Jaroslav Kysela |
401ece |
- {
|
|
Jaroslav Kysela |
401ece |
- @func concat
|
|
Jaroslav Kysela |
401ece |
- strings [
|
|
Jaroslav Kysela |
401ece |
- { @func datadir }
|
|
Jaroslav Kysela |
401ece |
- "/alsa.conf.d/"
|
|
Jaroslav Kysela |
401ece |
- ]
|
|
Jaroslav Kysela |
401ece |
- }
|
|
Jaroslav Kysela |
401ece |
+ "/etc/alsa/conf.d"
|
|
Jaroslav Kysela |
401ece |
"/etc/asound.conf"
|
|
Jaroslav Kysela |
401ece |
"~/.asoundrc"
|
|
Jaroslav Kysela |
401ece |
]
|
|
Jaroslav Kysela |
401ece |
--
|
|
Jaroslav Kysela |
401ece |
2.13.6
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
From 78505dccd23546cc77e5221cb21c01325bc0138d Mon Sep 17 00:00:00 2001
|
|
Jaroslav Kysela |
401ece |
From: Jaroslav Kysela <perex@perex.cz>
|
|
Jaroslav Kysela |
401ece |
Date: Wed, 4 Apr 2018 10:02:49 +0200
|
|
Jaroslav Kysela |
401ece |
Subject: [PATCH 2/2] conf: remove alsa.conf.d from the datadir
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
Jaroslav Kysela |
401ece |
---
|
|
Jaroslav Kysela |
401ece |
src/conf/Makefile.am | 2 +-
|
|
Jaroslav Kysela |
401ece |
src/conf/alsa.conf.d/Makefile.am | 8 --------
|
|
Jaroslav Kysela |
401ece |
src/conf/alsa.conf.d/README | 2 --
|
|
Jaroslav Kysela |
401ece |
3 files changed, 1 insertion(+), 11 deletions(-)
|
|
Jaroslav Kysela |
401ece |
delete mode 100644 src/conf/alsa.conf.d/Makefile.am
|
|
Jaroslav Kysela |
401ece |
delete mode 100644 src/conf/alsa.conf.d/README
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
|
|
Jaroslav Kysela |
401ece |
index ef2ea9c1..2b46f95c 100644
|
|
Jaroslav Kysela |
401ece |
--- a/src/conf/Makefile.am
|
|
Jaroslav Kysela |
401ece |
+++ b/src/conf/Makefile.am
|
|
Jaroslav Kysela |
401ece |
@@ -1,4 +1,4 @@
|
|
Jaroslav Kysela |
401ece |
-SUBDIRS=cards pcm alsa.conf.d
|
|
Jaroslav Kysela |
401ece |
+SUBDIRS=cards pcm
|
|
Jaroslav Kysela |
401ece |
|
|
Jaroslav Kysela |
401ece |
if BUILD_UCM
|
|
Jaroslav Kysela |
401ece |
SUBDIRS += ucm
|
|
Jaroslav Kysela |
401ece |
diff --git a/src/conf/alsa.conf.d/Makefile.am b/src/conf/alsa.conf.d/Makefile.am
|
|
Jaroslav Kysela |
401ece |
deleted file mode 100644
|
|
Jaroslav Kysela |
401ece |
index c91661e9..00000000
|
|
Jaroslav Kysela |
401ece |
--- a/src/conf/alsa.conf.d/Makefile.am
|
|
Jaroslav Kysela |
401ece |
+++ /dev/null
|
|
Jaroslav Kysela |
401ece |
@@ -1,8 +0,0 @@
|
|
Jaroslav Kysela |
401ece |
-alsaconfigdir = @ALSA_CONFIG_DIR@
|
|
Jaroslav Kysela |
401ece |
-alsadir = $(alsaconfigdir)/alsa.conf.d
|
|
Jaroslav Kysela |
401ece |
-cfg_files = README
|
|
Jaroslav Kysela |
401ece |
-
|
|
Jaroslav Kysela |
401ece |
-alsa_DATA = $(cfg_files)
|
|
Jaroslav Kysela |
401ece |
-
|
|
Jaroslav Kysela |
401ece |
-EXTRA_DIST = \
|
|
Jaroslav Kysela |
401ece |
- $(cfg_files)
|
|
Jaroslav Kysela |
401ece |
diff --git a/src/conf/alsa.conf.d/README b/src/conf/alsa.conf.d/README
|
|
Jaroslav Kysela |
401ece |
deleted file mode 100644
|
|
Jaroslav Kysela |
401ece |
index 99978848..00000000
|
|
Jaroslav Kysela |
401ece |
--- a/src/conf/alsa.conf.d/README
|
|
Jaroslav Kysela |
401ece |
+++ /dev/null
|
|
Jaroslav Kysela |
401ece |
@@ -1,2 +0,0 @@
|
|
Jaroslav Kysela |
401ece |
-You can place files named *.conf in this folder and they will be processed
|
|
Jaroslav Kysela |
401ece |
-when initialising alsa-lib.
|
|
Jaroslav Kysela |
401ece |
--
|
|
Jaroslav Kysela |
401ece |
2.13.6
|
|
Jaroslav Kysela |
401ece |
|