[zeus/master][PATCH] arago.conf, alsa-plugins: disconnect alsa from pulseaudio

[zeus/master][PATCH] arago.conf, alsa-plugins: disconnect alsa from pulseaudio

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 meta-arago-distro/conf/distro/arago.conf                     |  4 ++++
 .../recipes-multimedia/alsa/alsa-plugins_%.bbappend          | 12 ------------
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-multimedia/alsa/alsa-plugins_%.bbappend

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index f760bf9..5bc6a24 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -137,6 +137,10 @@ PACKAGECONFIG_append_pn-libsdl2 = " kmsdrm"
 # Enable cryptodev/devcrypto engine in OpenSSL 1.1
 PACKAGECONFIG_append_pn-openssl = " cryptodev-linux"
 
+# Disable pulseaudio routing in alsa by default
+PACKAGECONFIG_remove_pn-alsa-plugins = "pulseaudio"
+RDEPENDS_pulseaudio-server_remove = "alsa-plugins-pulseaudio-conf"
+
 # Configure RAMFS for jailhouse linux-demo
 JH_RAMFS_IMAGE = "arago-tiny-image"
 
diff --git a/meta-arago-distro/recipes-multimedia/alsa/alsa-plugins_%.bbappend b/meta-arago-distro/recipes-multimedia/alsa/alsa-plugins_%.bbappend
deleted file mode 100644
index 7e98c00..0000000
--- a/meta-arago-distro/recipes-multimedia/alsa/alsa-plugins_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-PR_append = ".arago0"
-
-do_install_append() {
-	# We don't want pulse to be the default audio device, even when installed
-	if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then
-		mv ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example || true
-	fi
-}
-
-FILES_${PN}-pulseaudio-conf += "\
-	${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf.example \
-"
-- 
2.7.4