diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2015-07-30 11:03:27 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 15:35:34 +0100 |
| commit | eb14c2ea542cf1209a7b743c27a64f82dc907991 (patch) | |
| tree | de0818410c83500d060351b40edb34bf4db7d067 /meta | |
| parent | 1eefbf6bdf5e720767673a754e95c62f2ffcc82f (diff) | |
| download | openembedded-core-contrib-eb14c2ea542cf1209a7b743c27a64f82dc907991.tar.gz | |
alsa-utils: assume the alsa storing is success if machine has no sound card
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb | 1 |
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 @@ +[PATCH] assume storing is success if not sound card device + +Upstream-Statue: Pending + +Systemd will report failure when run alsa-*, if the machine has not the +sound card. To void this annoyed message, alsa-restore/alsa-state ignore +all the exit codes by prefixing "-" in ExecStart, like: + + alsa-utils-1.0.29$ grep "=-" ./ -r|grep service.in + ./alsactl/alsa-restore.service.in:ExecStart=-@sbindir@/alsactl restore + ./alsactl/alsa-state.service.in:ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon + ./alsactl/alsa-state.service.in:ExecStop=-@sbindir@/alsactl -s kill save_and_quit + lsa-utils-1.0.29$ + +But alsa-store.service.in is missing, and better solution is to ignore +the exit code 19 which means not sound card device, not all exit code + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + alsactl/alsa-store.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/alsactl/alsa-store.service.in b/alsactl/alsa-store.service.in +index f1a56bb..68ca529 100644 +--- a/alsactl/alsa-store.service.in ++++ b/alsactl/alsa-store.service.in +@@ -13,3 +13,4 @@ Before=shutdown.target + Type=oneshot + ExecStart=@sbindir@/alsactl store + StandardOutput=syslog ++SuccessExitStatus=0 19 +-- +1.9.1 + diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb index 65cae0b928..263f38ab82 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.29.bb @@ -14,6 +14,7 @@ PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xm SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ file://alsa-utils-aplay-interrupt-signal-handling.patch \ + file://assume-storing-is-success-if-not-sound-card-device.patch \ " SRC_URI[md5sum] = "6b289bf874c4c9a63f4b3973093dd404" |