summaryrefslogtreecommitdiff
path: root/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-10-09 20:13:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:05:06 +0100
commit467f54ccf2409700600811b844d470bfb0720c01 (patch)
tree272b9f56fb9a7d9b3be17f0148980c715ecfecd7 /meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
parent8c7adb66d297ccf9f2f15eb311e5de7d5b07c6df (diff)
downloadopenembedded-core-467f54ccf2409700600811b844d470bfb0720c01.tar.gz
openembedded-core-467f54ccf2409700600811b844d470bfb0720c01.tar.bz2
openembedded-core-467f54ccf2409700600811b844d470bfb0720c01.tar.xz
openembedded-core-467f54ccf2409700600811b844d470bfb0720c01.zip
alsa-utils 0.10.24.2: fix systemd units when there's no asound.state
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
new file mode 100644
index 000000000..334c94e2f
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
@@ -0,0 +1,46 @@
+From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sun, 9 Oct 2011 20:06:35 +0200
+Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing
+
+This avoids an error on bootup
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+
+Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
+
+Upstream-status: Pending
+
+ alsactl/Makefile.am | 2 +-
+ alsactl/alsa-restore.service.in | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
+index 5cfc415..c3768c4 100644
+--- a/alsactl/Makefile.am
++++ b/alsactl/Makefile.am
+@@ -34,7 +34,7 @@ install-data-hook:
+ endif
+
+ edit = \
+- sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
++ sed $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
+
+ alsa-store.service: alsa-store.service.in
+ $(edit)
+diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
+index e97d196..3b76710 100644
+--- a/alsactl/alsa-restore.service.in
++++ b/alsactl/alsa-restore.service.in
+@@ -4,6 +4,7 @@ DefaultDependencies=no
+ After=sysinit.target
+ Before=shutdown.target
+ Conflicts=shutdown.target
++ConditionPathExists=@localstatedir@/lib/alsa/asound.state
+
+ [Service]
+ Type=oneshot
+--
+1.6.6.1
+