[alsa-devel] [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
Hi all, [0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules [0] http://www.alsa-project.org/main/index.php/Changes_v1.0.27_v1.0.27.1 Thanks Signed-off-by: Elimar Riesebieter <riesebie@lxtec.de> --- alsactl/90-alsa-restore.rules.in | 8 -------- alsactl/Makefile.am | 5 ----- 2 files changed, 13 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in deleted file mode 100644 index 88e12e0..0000000 --- a/alsactl/90-alsa-restore.rules.in +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" -GOTO="alsa_restore_end" - -LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{number}" - -LABEL="alsa_restore_end" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index bac84eb..3bf8eca 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -11,8 +11,6 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" 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 if HAVE_SYSTEMD @@ -49,20 +47,17 @@ alsa-restore.service: alsa-restore.service.in alsa-store.service: alsa-store.service.in $(edit) -90-alsa-restore.rules: 90-alsa-restore.rules.in $(edit) EXTRA_DIST += \ alsa-state.service.in \ alsa-restore.service.in \ alsa-store.service.in \ - 90-alsa-restore.rules.in CLEANFILES = \ alsa-state.service \ alsa-restore.service \ alsa-store.service \ - 90-alsa-restore.rules %.7: %.xml xmlto man $?
* Elimar Riesebieter <riesebie@lxtec.de> [2013-05-30 15:08 +0200]:
Hi all,
[0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball
but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules
[0] http://www.alsa-project.org/main/index.php/Changes_v1.0.27_v1.0.27.1
[...]
-90-alsa-restore.rules: 90-alsa-restore.rules.in $(edit) ^^^^^^^^ Should be removed as well
Thanks Elimar Signed-off-by: Elimar Riesebieter <riesebie@lxtec.de> --- alsactl/90-alsa-restore.rules.in | 8 -------- alsactl/Makefile.am | 7 ------- 2 files changed, 15 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in deleted file mode 100644 index 88e12e0..0000000 --- a/alsactl/90-alsa-restore.rules.in +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" -GOTO="alsa_restore_end" - -LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{number}" - -LABEL="alsa_restore_end" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index bac84eb..c32adc0 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -11,8 +11,6 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" 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 if HAVE_SYSTEMD @@ -49,20 +47,15 @@ alsa-restore.service: alsa-restore.service.in alsa-store.service: alsa-store.service.in $(edit) -90-alsa-restore.rules: 90-alsa-restore.rules.in - $(edit) - EXTRA_DIST += \ alsa-state.service.in \ alsa-restore.service.in \ alsa-store.service.in \ - 90-alsa-restore.rules.in CLEANFILES = \ alsa-state.service \ alsa-restore.service \ alsa-store.service \ - 90-alsa-restore.rules %.7: %.xml xmlto man $?
* Elimar Riesebieter <riesebie@lxtec.de> [2013-05-30 15:28 +0200]:
* Elimar Riesebieter <riesebie@lxtec.de> [2013-05-30 15:08 +0200]:
Hi all,
[0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball
but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules
[0] http://www.alsa-project.org/main/index.php/Changes_v1.0.27_v1.0.27.1
[...]
-90-alsa-restore.rules: 90-alsa-restore.rules.in $(edit) ^^^^^^^^ Should be removed as well
Forgot two backslashes... Signed-off-by: Elimar Riesebieter <riesebie@lxtec.de> --- alsactl/90-alsa-restore.rules.in | 8 -------- alsactl/Makefile.am | 11 ++--------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in deleted file mode 100644 index 88e12e0..0000000 --- a/alsactl/90-alsa-restore.rules.in +++ /dev/null @@ -1,8 +0,0 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go" -GOTO="alsa_restore_end" - -LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{number}" - -LABEL="alsa_restore_end" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index bac84eb..b933ce9 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -11,8 +11,6 @@ alsactl_SOURCES=alsactl.c state.c lock.c utils.c init_parse.c daemon.c alsactl_CFLAGS=$(AM_CFLAGS) -D__USE_GNU -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\" -DSYS_PIDFILE=\"$(ALSACTL_PIDFILE_DIR)/alsactl.pid\" 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 if HAVE_SYSTEMD @@ -49,20 +47,15 @@ alsa-restore.service: alsa-restore.service.in alsa-store.service: alsa-store.service.in $(edit) -90-alsa-restore.rules: 90-alsa-restore.rules.in - $(edit) - EXTRA_DIST += \ alsa-state.service.in \ alsa-restore.service.in \ - alsa-store.service.in \ - 90-alsa-restore.rules.in + alsa-store.service.in CLEANFILES = \ alsa-state.service \ alsa-restore.service \ - alsa-store.service \ - 90-alsa-restore.rules + alsa-store.service %.7: %.xml xmlto man $?
Date 30.5.2013 15:08, Elimar Riesebieter wrote:
Hi all,
[0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball
but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules
It's correct. The rules file should be generated after configure/make with correct paths. It's not a complete removal of this feature. You probably miss this fix: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=c0f70a0b8e340d6... Jaroslav -- Jaroslav Kysela <perex@perex.cz> Linux Kernel Sound Maintainer ALSA Project; Red Hat, Inc.
* Jaroslav Kysela <perex@perex.cz> [2013-05-30 15:55 +0200]:
Date 30.5.2013 15:08, Elimar Riesebieter wrote:
Hi all,
[0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball
but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules
It's correct. The rules file should be generated after configure/make with correct paths.
It's not a complete removal of this feature. You probably miss this fix:
http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=c0f70a0b8e340d6...
Well, it is useless when EPREFIX (i.e /usr) isn't mounted while udev runs? It should be better to restore mixer settings by an initscript. Elimar -- On the keyboard of life you have always to keep a finger at the escape key;-)
Date 30.5.2013 17:06, Elimar Riesebieter wrote:
* Jaroslav Kysela <perex@perex.cz> [2013-05-30 15:55 +0200]:
Date 30.5.2013 15:08, Elimar Riesebieter wrote:
Hi all,
[0] tells: alsactl: remove 90-alsa-restore.rules from the tar ball
but it still ships 90-alsa-restore.rules.in and installs the file as 90-alsa-restore.rules
It's correct. The rules file should be generated after configure/make with correct paths.
It's not a complete removal of this feature. You probably miss this fix:
http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff;h=c0f70a0b8e340d6...
Well, it is useless when EPREFIX (i.e /usr) isn't mounted while udev runs?
The distro should handle this situation.
It should be better to restore mixer settings by an initscript.
It does not work for plug and play devices. Jaroslav -- Jaroslav Kysela <perex@perex.cz> Linux Kernel Sound Maintainer ALSA Project; Red Hat, Inc.
participants (2)
-
Elimar Riesebieter -
Jaroslav Kysela