From f047a8a66917960ef5a9ff0e41de507f0e58f381 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 4 Dec 2025 14:11:48 +0100
Subject: [PATCH] alsactl: move udev/systemd files to conf subdirectory

It is a cleanup to not mix C source code with system configuration files.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 alsactl/.gitignore                            |  8 +++--
 alsactl/Makefile.am                           | 31 ++++++++++---------
 alsactl/{ => conf}/90-alsa-restore.rules.in   |  0
 alsactl/{ => conf}/alsa-card-wait@.service.in |  0
 alsactl/{ => conf}/alsa-restore.service.in    |  0
 alsactl/{ => conf}/alsa-state.service.in      |  0
 6 files changed, 21 insertions(+), 18 deletions(-)
 rename alsactl/{ => conf}/90-alsa-restore.rules.in (100%)
 rename alsactl/{ => conf}/alsa-card-wait@.service.in (100%)
 rename alsactl/{ => conf}/alsa-restore.service.in (100%)
 rename alsactl/{ => conf}/alsa-state.service.in (100%)

diff --git a/alsactl/.gitignore b/alsactl/.gitignore
index 56ab3a2..e8fe186 100644
--- a/alsactl/.gitignore
+++ b/alsactl/.gitignore
@@ -1,3 +1,5 @@
-alsa-store.service
-alsa-restore.service
-90-alsa-restore.rules
+conf/90-alsa-restore.rules
+conf/alsa-state.service
+conf/alsa-store.service
+conf/alsa-restore.service
+conf/alsa-card-wait@.service
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index e3ba05b..48b7c7a 100644
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -25,14 +25,14 @@ noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c \
                init_utils_run.c init_sysfs.c
 
 udevrules_DATA = \
-	90-alsa-restore.rules
+	conf/90-alsa-restore.rules
 
 if HAVE_SYSTEMD
 
 systemdsystemunit_DATA = \
-	alsa-state.service \
-	alsa-restore.service \
-	alsa-card-wait@.service.in
+	conf/alsa-state.service \
+	conf/alsa-restore.service \
+	conf/alsa-card-wait@.service
 
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -55,28 +55,29 @@ edit = \
 		  -e "s;@args\@;$${args};g" \
 							< $< > $@ || rm $@
 
-alsa-state.service: alsa-state.service.in
+conf/alsa-state.service: conf/alsa-state.service.in
 	$(edit)
 
-alsa-restore.service: alsa-restore.service.in
+conf/alsa-restore.service: conf/alsa-restore.service.in
 	$(edit)
 
-alsa-card-wait@.service: alsa-card-wait@.service.in
+conf/alsa-card-wait@.service: conf/alsa-card-wait@.service.in
 	$(edit)
 
-90-alsa-restore.rules: 90-alsa-restore.rules.in
+conf/90-alsa-restore.rules: conf/90-alsa-restore.rules.in
 	$(edit)
 
 EXTRA_DIST += \
-	alsa-state.service.in \
-	alsa-restore.service.in \
-	90-alsa-restore.rules.in
+	conf/alsa-state.service.in \
+	conf/alsa-restore.service.in \
+	conf/alsa-card-wait@.service.in \
+	conf/90-alsa-restore.rules.in
 
 CLEANFILES = \
-	alsa-state.service \
-	alsa-restore.service \
-	alsa-card-wait@.service \
-	90-alsa-restore.rules
+	conf/alsa-state.service \
+	conf/alsa-restore.service \
+	conf/alsa-card-wait@.service \
+	conf/90-alsa-restore.rules
 
 %.7: %.xml
 	xmlto man $?
diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/conf/90-alsa-restore.rules.in
similarity index 100%
rename from alsactl/90-alsa-restore.rules.in
rename to alsactl/conf/90-alsa-restore.rules.in
diff --git a/alsactl/alsa-card-wait@.service.in b/alsactl/conf/alsa-card-wait@.service.in
similarity index 100%
rename from alsactl/alsa-card-wait@.service.in
rename to alsactl/conf/alsa-card-wait@.service.in
diff --git a/alsactl/alsa-restore.service.in b/alsactl/conf/alsa-restore.service.in
similarity index 100%
rename from alsactl/alsa-restore.service.in
rename to alsactl/conf/alsa-restore.service.in
diff --git a/alsactl/alsa-state.service.in b/alsactl/conf/alsa-state.service.in
similarity index 100%
rename from alsactl/alsa-state.service.in
rename to alsactl/conf/alsa-state.service.in
-- 
2.47.3