summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2013-12-13 07:47:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-13 12:36:06 +0000
commit1a4fd0dd66ee4f1acbbe00f32085bf0d20530526 (patch)
tree570ec9a5d23787188b6e4c7ce3707728a59b8b27 /meta
parentaa7eb9544abe8478eed7818c74863569a51e894c (diff)
downloadpoky-1a4fd0dd66ee4f1acbbe00f32085bf0d20530526.tar.gz
pulseaudio: only package consolekit module when x11 is enabled
As requested by Martin Jansa <martin.jansa@gmail.com>. (From OE-Core master rev: 3e148f863d55728bbfa2d94b602b03dc56b70d4c) (From OE-Core rev: 7ee4d9e1b29a1c0a2552a008fc264c592ef5ae4a) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index b7a6eba195..27879ceeee 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -74,7 +74,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
74# adding the console-kit module to an image, we also get the necessary 74# adding the console-kit module to an image, we also get the necessary
75# consolekit package produced. 75# consolekit package produced.
76PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ 76PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \
77 pulseaudio-server pulseaudio-misc pulseaudio-module-console-kit" 77 pulseaudio-server pulseaudio-misc ${@base_contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}"
78 78
79#upgrade path: 79#upgrade path:
80RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" 80RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"