summaryrefslogtreecommitdiffstats
path: root/meta-agl-profile-core/recipes-multimedia
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2018-07-20 14:34:23 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-08-02 14:50:10 +0000
commit9c7ad71d534c87fa62ba744a50fe76f04e91ad07 (patch)
tree10988f4c9ac3d9ebe4ed2d52183d178d25e68f7a /meta-agl-profile-core/recipes-multimedia
parent95a776df58440ca1059f12b13d0e2ab945c69899 (diff)
pulseaudio: remove 10-unload-modules.pa
This interferes with the default.pa that is shipped in meta-audio-4a-framework (unload modules fails because the modules are not loaded). Change-Id: I0d82fd0e3696ba3b1615b45599bce8e69c3e464d Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Diffstat (limited to 'meta-agl-profile-core/recipes-multimedia')
-rw-r--r--meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa4
-rw-r--r--meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend12
2 files changed, 0 insertions, 16 deletions
diff --git a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa
deleted file mode 100644
index 1f8b723e2..000000000
--- a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio/10-unload-modules.pa
+++ /dev/null
@@ -1,4 +0,0 @@
-unload-module module-role-cork
-unload-module module-device-restore
-unload-module module-stream-restore
-unload-module module-card-restore
diff --git a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 7eebe306d..6d7347d9d 100644
--- a/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-agl-profile-core/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -1,19 +1,7 @@
FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-SRC_URI += "file://10-unload-modules.pa"
-
inherit systemd
-
-# Add .include directive to default.pa so optional configuration can be added
-do_install_append () {
- 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/
-}
-
-
do_install_append() {
# Install pulseaudio systemd service
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then