summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
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:08:38 +0100
commit8262a89410cf2e8b303da77dd850e6ac11650517 (patch)
tree05035991c2fa6bbcc504e551c9088c8347a5df29 /meta/recipes-multimedia
parentaaf52a5c6a2524b8a2e48ea9f9f60db24d8301ac (diff)
downloadpoky-8262a89410cf2e8b303da77dd850e6ac11650517.tar.gz
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>
Diffstat (limited to 'meta/recipes-multimedia')
-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
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb3
2 files changed, 48 insertions, 1 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 0000000000..334c94e2fc
--- /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 @@
1From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 9 Oct 2011 20:06:35 +0200
4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing
5
6This avoids an error on bootup
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9---
10
11Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
12
13Upstream-status: Pending
14
15 alsactl/Makefile.am | 2 +-
16 alsactl/alsa-restore.service.in | 1 +
17 2 files changed, 2 insertions(+), 1 deletions(-)
18
19diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
20index 5cfc415..c3768c4 100644
21--- a/alsactl/Makefile.am
22+++ b/alsactl/Makefile.am
23@@ -34,7 +34,7 @@ install-data-hook:
24 endif
25
26 edit = \
27- sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
28+ sed $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
29
30 alsa-store.service: alsa-store.service.in
31 $(edit)
32diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
33index e97d196..3b76710 100644
34--- a/alsactl/alsa-restore.service.in
35+++ b/alsactl/alsa-restore.service.in
36@@ -4,6 +4,7 @@ DefaultDependencies=no
37 After=sysinit.target
38 Before=shutdown.target
39 Conflicts=shutdown.target
40+ConditionPathExists=@localstatedir@/lib/alsa/asound.state
41
42 [Service]
43 Type=oneshot
44--
451.6.6.1
46
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
index 1b3ffe11b4..9eee60a0da 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
@@ -6,11 +6,12 @@ LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" 7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
8DEPENDS = "alsa-lib ncurses" 8DEPENDS = "alsa-lib ncurses"
9PR = "r2" 9PR = "r3"
10 10
11SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 11SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
12 file://ncursesfix.patch \ 12 file://ncursesfix.patch \
13 file://uclibc-exp10-replacement.patch \ 13 file://uclibc-exp10-replacement.patch \
14 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
14 " 15 "
15 16
16SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2" 17SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2"