aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2013-05-14 14:01:52 +0300
committerFlorin Sarbu <florin.sarbu@windriver.com>2013-05-14 14:03:54 +0300
commit34ec983e2755ba9dee24aef3f2d0d76016877eb3 (patch)
treedeecfbb15c7e1a0cea5ef97948a9b4b062674aae
parent5e8e209c666f5c596728c4589aaca964208cf5fb (diff)
downloadmeta-ivi-34ec983e2755ba9dee24aef3f2d0d76016877eb3.tar.gz
meta-ivi-34ec983e2755ba9dee24aef3f2d0d76016877eb3.tar.bz2
meta-ivi-34ec983e2755ba9dee24aef3f2d0d76016877eb3.zip
pulseaudio: Add pulseaudio-server rpm to packagegroup-core-p2.bb
instead of just the pulseaudio rpm. Also provide a systemd service in the rootfs. Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
-rw-r--r--recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service14
-rw-r--r--recipes-multimedia/pulseaudio/pulseaudio_3.0.bbappend21
-rw-r--r--recipes-yocto-ivi/packagegroups/packagegroup-core-p2.bb4
3 files changed, 35 insertions, 4 deletions
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service b/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service
new file mode 100644
index 0000000..6c10d5c
--- /dev/null
+++ b/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=pulseaudio server
+Requires=dbus.service
+After=dbus.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/pulseaudio --log-level=0
+Restart=always
+RestartSec=5
+TimeoutSec=5
+
+[Install]
+WantedBy=multi-user.target \ No newline at end of file
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_3.0.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_3.0.bbappend
index 65443cd..1239f5c 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_3.0.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_3.0.bbappend
@@ -1,6 +1,12 @@
-PRINC := "${@int(PRINC) + 3}"
+PRINC := "${@int(PRINC) + 4}"
-# Remove gconf at it triggers a GPLv3 dependency
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " file://pulseaudio.service "
+
+SYSTEMD_SERVICE = "pulseaudio.service"
+
+# Remove gconf as it triggers a GPLv3 dependency
DEPENDS := "${@oe_filter_out('gconf', '${DEPENDS}', d)}"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
@@ -12,6 +18,10 @@ RDEPENDS_pulseaudio-server += "\
# We use pulseaudio-module-systemd-login so let's drop pulseaudio-module-console-kit
RDEPENDS_pulseaudio-server := "${@oe_filter_out('pulseaudio-module-console-kit', '${RDEPENDS_pulseaudio-server}', d)}"
+FILES_${PN}-server += " \
+ ${systemd_unitdir}/system/pulseaudio.service \
+ "
+
do_configure_append () {
# udev_get_dev_path(), udev_get_sys_path(), udev_get_run_path()
# systemd does not allow to configure any of these filesystem paths
@@ -20,3 +30,10 @@ do_configure_append () {
sed -i 's:udev_get_sys_path(udev):"/sys":' src/modules/udev-util.c
sed -i 's:udev_get_dev_path(u->udev):"/dev":' src/modules/module-udev-detect.c
}
+
+do_install_append() {
+ if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/pulseaudio.service ${D}${systemd_unitdir}/system
+ fi
+} \ No newline at end of file
diff --git a/recipes-yocto-ivi/packagegroups/packagegroup-core-p2.bb b/recipes-yocto-ivi/packagegroups/packagegroup-core-p2.bb
index cf85c76..e9b7b86 100644
--- a/recipes-yocto-ivi/packagegroups/packagegroup-core-p2.bb
+++ b/recipes-yocto-ivi/packagegroups/packagegroup-core-p2.bb
@@ -10,10 +10,10 @@ PACKAGES = "\
"
RDEPENDS_packagegroup-core-p2 = "\
- pulseaudio \
+ node-state-manager \
ofono \
ofono-systemd \
- node-state-manager \
+ pulseaudio-server \
wireless-tools \
"