alsa-utils 0.10.24.2: fix systemd units when there's no asound.state
(From OE-Core rev: 467f54ccf2409700600811b844d470bfb0720c01) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
aaf52a5c6a
commit
8262a89410
|
@ -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
|
||||
|
|
@ -6,11 +6,12 @@ LICENSE = "GPLv2+"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
|
||||
file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
|
||||
DEPENDS = "alsa-lib ncurses"
|
||||
PR = "r2"
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
|
||||
file://ncursesfix.patch \
|
||||
file://uclibc-exp10-replacement.patch \
|
||||
file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2"
|
||||
|
|
Loading…
Reference in New Issue