summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-07-26 23:03:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-27 22:45:24 +0100
commit69d6984159834713ffb56762f50226afe27d22f5 (patch)
tree27188b4ff37f861c5bf16e6ab2d970564c907591
parentaa3f5bd67f14defc5cdc39ba3c78f825dd85c69f (diff)
downloadopenembedded-core-contrib-69d6984159834713ffb56762f50226afe27d22f5.tar.gz
openembedded-core-contrib-69d6984159834713ffb56762f50226afe27d22f5.tar.bz2
openembedded-core-contrib-69d6984159834713ffb56762f50226afe27d22f5.zip
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 <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc5
1 files changed, 4 insertions, 1 deletions
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)}"