Putting client.conf to a separate package allows other recipes to
provide a replacement package when a custom version of client.conf is
needed (Sato will need that to make autospawning work for root).
Signed-off-by: Tanu Kaskinen <tanu.kaski...@linux.intel.com>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 44aabea..d99dbd2 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -72,7 +72,8 @@ USERADD_PARAM_pulseaudio-server = "--system --home
/var/run/pulse \
# adding the console-kit module to an image, we also get the necessary
# consolekit package produced.
PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple
libpulse-mainloop-glib \
- pulseaudio-server pulseaudio-misc
${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit',
'', d)}"
+ pulseaudio-client-conf pulseaudio-server pulseaudio-misc \
+ ${@bb.utils.contains('PACKAGECONFIG', 'x11',
'pulseaudio-module-console-kit', '', d)}"
#upgrade path:
RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
@@ -81,11 +82,7 @@ PACKAGES_DYNAMIC += "^pulseaudio-lib-.*
^pulseaudio-module-.*"
FILES_libpulsecore = "${libdir}/libpulsecore*.so"
FILES_libpulsecommon = "${libdir}/pulseaudio/libpulsecommon*.so"
-
-# client.conf configures the behaviour of libpulse, so it belongs in the same
-# package.
-FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf"
-
+FILES_libpulse = "${libdir}/libpulse.so.*"
FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
@@ -94,6 +91,7 @@ FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala
${libdir}/cmake"
FILES_${PN}-conf = "${sysconfdir}"
FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
+FILES_${PN}-client-conf = "${sysconfdir}/pulse/client.conf"
FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir}
${bindir}/pactl */udev/rules.d/*.rules"
#SYSTEMD_PACKAGES = "${PN}-server"
@@ -104,7 +102,7 @@ FILES_${PN}-misc = "${bindir}/*
${libdir}/pulseaudio/libpulsedsp.so"
# Allow the pulseaudio package to be created empty as a placeholder (-dbg and
-dev depend on it)
ALLOW_EMPTY_${PN} = "1"
-CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf"
+CONFFILES_${PN}-client-conf = "${sysconfdir}/pulse/client.conf"
CONFFILES_pulseaudio-server = "\
${sysconfdir}/pulse/default.pa \
@@ -126,6 +124,9 @@ python populate_packages_prepend() {
do_split_packages(d, plugindir, '^lib(.*)\.so$', 'pulseaudio-lib-%s',
'PulseAudio library for %s', extra_depends='', prepend=True)
}
+# client.conf controls libpulse behaviour, hence the dependency.
+REDPENDS_libpulse += "pulseaudio-client-conf"
+
RDEPENDS_pulseaudio-server = " \
pulseaudio-module-filter-apply \
pulseaudio-module-filter-heuristics \
--
1.9.3
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
