From 69d6984159834713ffb56762f50226afe27d22f5 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 26 Jul 2019 23:03:15 +0800 Subject: pulseaudio: don't include consolekit when systemd is enabled When using systemd, make sure that pulseaudio-server RDEPENDS on module-systemd-login instead of module-console-kit both of which provide the same functionality but for different init systems [1][2]. Even though both modules can co-exist, this helps avoid including consolekit (which has been deprecated) in the images using systemd. [1] https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Modules/#index51h3 [2] https://github.com/pulseaudio/pulseaudio/commit/860d1cf3a76701ade38784822abb24285176227c Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/recipes-multimedia/pulseaudio') diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index e245be7f77..ec51d8b279 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -259,9 +259,12 @@ FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir} # modules must be installed when X11 is enabled. RDEPENDS_pulseaudio-server += "\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '\ - pulseaudio-module-console-kit \ pulseaudio-module-device-manager \ pulseaudio-module-x11-cork-request \ pulseaudio-module-x11-publish \ pulseaudio-module-x11-xsmp \ ', '', d)}" + +RDEPENDS_pulseaudio-server += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ + bb.utils.contains('DISTRO_FEATURES', 'systemd', 'pulseaudio-module-systemd-login', 'pulseaudio-module-console-kit', d), \ + '', d)}" -- cgit 1.2.3-korg