* [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
@ 2013-05-30 13:08 Elimar Riesebieter
2013-05-30 13:28 ` Elimar Riesebieter
2013-05-30 13:55 ` Jaroslav Kysela
0 siblings, 2 replies; 6+ messages in thread
From: Elimar Riesebieter @ 2013-05-30 13:08 UTC (permalink / raw)
To: alsa-devel; +Cc: pkg-alsa-devel
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 $?
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
2013-05-30 13:08 [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules Elimar Riesebieter
@ 2013-05-30 13:28 ` Elimar Riesebieter
2013-05-30 13:41 ` Elimar Riesebieter
2013-05-30 13:55 ` Jaroslav Kysela
1 sibling, 1 reply; 6+ messages in thread
From: Elimar Riesebieter @ 2013-05-30 13:28 UTC (permalink / raw)
To: alsa-devel; +Cc: pkg-alsa-devel
* 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 $?
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
2013-05-30 13:28 ` Elimar Riesebieter
@ 2013-05-30 13:41 ` Elimar Riesebieter
0 siblings, 0 replies; 6+ messages in thread
From: Elimar Riesebieter @ 2013-05-30 13:41 UTC (permalink / raw)
To: alsa-devel, pkg-alsa-devel
* 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 $?
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
2013-05-30 13:08 [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules Elimar Riesebieter
2013-05-30 13:28 ` Elimar Riesebieter
@ 2013-05-30 13:55 ` Jaroslav Kysela
2013-05-30 15:06 ` Elimar Riesebieter
1 sibling, 1 reply; 6+ messages in thread
From: Jaroslav Kysela @ 2013-05-30 13:55 UTC (permalink / raw)
To: Elimar Riesebieter; +Cc: ALSA development, pkg-alsa-devel
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=c0f70a0b8e340d6ee903ff226886bb6f969d46a1
Jaroslav
--
Jaroslav Kysela <perex@perex.cz>
Linux Kernel Sound Maintainer
ALSA Project; Red Hat, Inc.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
2013-05-30 13:55 ` Jaroslav Kysela
@ 2013-05-30 15:06 ` Elimar Riesebieter
2013-05-30 18:44 ` Jaroslav Kysela
0 siblings, 1 reply; 6+ messages in thread
From: Elimar Riesebieter @ 2013-05-30 15:06 UTC (permalink / raw)
To: Jaroslav Kysela; +Cc: ALSA development, pkg-alsa-devel
* 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=c0f70a0b8e340d6ee903ff226886bb6f969d46a1
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;-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules
2013-05-30 15:06 ` Elimar Riesebieter
@ 2013-05-30 18:44 ` Jaroslav Kysela
0 siblings, 0 replies; 6+ messages in thread
From: Jaroslav Kysela @ 2013-05-30 18:44 UTC (permalink / raw)
To: ALSA development, pkg-alsa-devel
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=c0f70a0b8e340d6ee903ff226886bb6f969d46a1
>
> 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-30 18:44 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-30 13:08 [PATCH] alsa-utils 1.0.27.1 still ships 90-alsa-restore.rules Elimar Riesebieter
2013-05-30 13:28 ` Elimar Riesebieter
2013-05-30 13:41 ` Elimar Riesebieter
2013-05-30 13:55 ` Jaroslav Kysela
2013-05-30 15:06 ` Elimar Riesebieter
2013-05-30 18:44 ` Jaroslav Kysela
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox