summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch34
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch b/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
new file mode 100644
index 0000000000..f67283db79
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch
@@ -0,0 +1,34 @@
1[PATCH] assume storing is success if not sound card device
2
3Upstream-Statue: Pending
4
5Systemd will report failure when run alsa-*, if the machine has not the
6sound card. To void this annoyed message, alsa-restore/alsa-state ignore
7all the exit codes by prefixing "-" in ExecStart, like:
8
9 alsa-utils-1.0.29$ grep "=-" ./ -r|grep service.in
10 ./alsactl/alsa-restore.service.in:ExecStart=-@sbindir@/alsactl restore
11 ./alsactl/alsa-state.service.in:ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon
12 ./alsactl/alsa-state.service.in:ExecStop=-@sbindir@/alsactl -s kill save_and_quit
13 lsa-utils-1.0.29$
14
15But alsa-store.service.in is missing, and better solution is to ignore
16the exit code 19 which means not sound card device, not all exit code
17
18Signed-off-by: Roy Li <rongqing.li@windriver.com>
19---
20 alsactl/alsa-store.service.in | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in
24index f1a56bb..68ca529 100644
25--- a/alsactl/alsa-store.service.in
26+++ b/alsactl/alsa-store.service.in
27@@ -13,3 +13,4 @@ Before=shutdown.target
28 Type=oneshot
29 ExecStart=@sbindir@/alsactl store
30 StandardOutput=syslog
31+SuccessExitStatus=0 19
32--
331.9.1
34
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index 506698edcd..26d4d917a3 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -14,6 +14,7 @@ PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xm
14SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 14SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
15 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ 15 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
16 file://alsa-utils-aplay-interrupt-signal-handling.patch \ 16 file://alsa-utils-aplay-interrupt-signal-handling.patch \
17 file://assume-storing-is-success-if-not-sound-card-device.patch \
17 " 18 "
18 19
19SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211" 20SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211"