rpm/alsa-utils
SHA256
1
0
Fork 0
forked from pool/alsa-utils
Code Pull Requests Activity

Accepting request 321608 from home:tiwai:branches:multimedia:libs

Browse Source 
- Suppress alsactl invocation on systems without sound cards
  (bsc#940950):
  0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch

OBS-URL: https://build.opensuse.org/request/show/321608
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=122
This commit is contained in:
Takashi Iwai 2015-08-10 13:24:25 +00:00 committed by Git OBS Bridge
parent bf2d02fb21
commit 9427a92d3e
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch Normal file
View File

@ -0,0 +1,50 @@
From 0e864e1a3aaf79d451556064eb09052530a0a085 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 10 Aug 2015 14:42:24 +0200
Subject: [PATCH] alsactl: Add path condition to alsa-store and alsa-restore
services
With alsa-restore.service and alsa-store.service, systemd invokes
alsactl at boot and shutdown times. When this is invoked on a system
without sound cards, it results in an ugly error message from alsact
/usr/sbin/alsactl: save_state:1590: No soundcards found...
return code is "19"
Add ConditionPathExistsGlob checks of /dev/snd/control* devices for
avoiding unnecessary invocations of alsactl on such a system.
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=940950
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
alsactl/alsa-restore.service.in | 1 +
alsactl/alsa-store.service.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
index 245a439798fc..d1a74d637457 100644
--- a/alsactl/alsa-restore.service.in
+++ b/alsactl/alsa-restore.service.in
@@ -6,6 +6,7 @@
[Unit]
Description=Restore Sound Card State
ConditionPathExists=!@daemonswitch@
+ConditionPathExistsGlob=/dev/snd/control*
DefaultDependencies=no
After=alsa-state.service
Before=shutdown.target
diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in
index f1a56bb9dbb5..c89cfff04f35 100644
--- a/alsactl/alsa-store.service.in
+++ b/alsactl/alsa-store.service.in
@@ -6,6 +6,7 @@
[Unit]
Description=Store Sound Card State
ConditionPathExists=!@daemonswitch@
+ConditionPathExistsGlob=/dev/snd/control*
DefaultDependencies=no
Before=shutdown.target
--
2.5.0

7
alsa-utils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Aug 10 15:05:45 CEST 2015 - tiwai@suse.de
- Suppress alsactl invocation on systems without sound cards
(bsc#940950):
0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch
-------------------------------------------------------------------
Tue Aug 4 17:48:44 CEST 2015 - tiwai@suse.de

2
alsa-utils.spec
View File

@ -53,6 +53,7 @@ Patch5: 0005-aplay-Fix-uninterruptible-aplay.patch
Patch6: 0006-alsactl-terminate-readlink-result-string.patch
Patch7: 0007-speaker-test-Add-option-to-specify-signal-scale.patch
Patch8: 0008-topology-Add-command-line-topology-tool-to-build-top.patch
Patch9: 0009-alsactl-Add-path-condition-to-alsa-store-and-alsa-re.patch
#
Patch99: alsa-utils-gettext-version-removal.diff
BuildRequires: alsa-devel
@ -88,6 +89,7 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
#
%if 0%{?suse_version} < 1020
%patch99 -p1