From d911635bdcb84bb162b49bca32c7c7867e56a023 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 29 Nov 2011 22:24:58 +0100
Subject: pulseaudio 1.1: only run volatiles script when populate-volatile.sh
exists
Volatiles are handled differently in a systemd world make the postinst fail:
//var/lib/opkg/info/pulseaudio-server.postinst: line 10: /etc/init.d/populate-volatile.sh: No such file or directory
Collected errors:
* pkg_run_script: package "pulseaudio-server" postinst script returned status 127.
* opkg_configure: pulseaudio-server.postinst returned 127.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 +++-
meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a94c39833..6cd6d161a 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -95,7 +95,9 @@ pkg_postinst_${PN}-server() {
adduser --disabled-password --home=/var/run/pulse --system \
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
addgroup pulse audio
- /etc/init.d/populate-volatile.sh update
+ if [ -e /etc/init.d/populate-volatile.sh ] ; then
+ /etc/init.d/populate-volatile.sh update
+ fi
}
pkg_postrm_${PN}-server() {
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
index d97c9327a..df3a53e11 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
@@ -1,5 +1,7 @@
require pulseaudio.inc
+PR = "r1"
+
DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
inherit gettext perlnative
--
cgit v1.2.3