diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2017-11-14 15:37:40 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2017-11-14 15:37:40 -0500 |
| commit | 74b387be8d81928cace317e902c5c8efaa095d7f (patch) | |
| tree | 6a1ba37c80bb098a9acbbba74daf620c55103d2f /recipes-multimedia/pulseaudio | |
| parent | 93b83aab80796ab959a95bf383c27f11357d52eb (diff) | |
Pulseaudio configuration fixes
Some fixes to work when 4A is enabled:
- Simplified the echo that adds /etc/pulse/default.d to
/etc/pulse/default.pa, as it was resulting in "-e -n" in the file
sometimes for reasons unknown.
- PulseAudio does not like the /etc/pulse/default.d directory being
empty, and additionally it was realized that the module unloads that
are in module-router.pa are useful in all our usecases and should
likely always be present. To kill two birds with one stone, the
unload lines have been moved to a 10-unload-modules.pa file that
is installed by the pulseaudio bbappend, and those lines have been
removed from the module-router.pa files, which has been renamed to
20-module-router.pa so that ordering will be maintained if someone
needs to reenable it.
Change-Id: I70cd1d0dfc596b894009c1bdd7520ffe6394e60e
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'recipes-multimedia/pulseaudio')
| -rw-r--r-- | recipes-multimedia/pulseaudio/files/10-unload-modules.pa | 4 | ||||
| -rw-r--r-- | recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/recipes-multimedia/pulseaudio/files/10-unload-modules.pa b/recipes-multimedia/pulseaudio/files/10-unload-modules.pa new file mode 100644 index 000000000..1f8b723e2 --- /dev/null +++ b/recipes-multimedia/pulseaudio/files/10-unload-modules.pa @@ -0,0 +1,4 @@ +unload-module module-role-cork +unload-module module-device-restore +unload-module module-stream-restore +unload-module module-card-restore diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index 88cd4504f..30ef4f7e8 100644 --- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -1,4 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://10-unload-modules.pa" + # Add .include directive to default.pa so optional configuration can be added do_install_append () { - echo -e -n "\n.include ${sysconfdir}/pulse/default.d\n" >> ${D}${sysconfdir}/pulse/default.pa + echo ".include ${sysconfdir}/pulse/default.d" >> ${D}${sysconfdir}/pulse/default.pa + install -d ${D}${sysconfdir}/pulse/default.d + install -m 0644 ${WORKDIR}/10-unload-modules.pa ${D}${sysconfdir}/pulse/default.d/ } |