aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-29 22:24:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-30 15:33:21 +0000
commitd911635bdcb84bb162b49bca32c7c7867e56a023 (patch)
tree908266f10b90f791259e3ef46edee4a19791064d
parent19cc725f32b3793a785fe06d27c64bc3e5f608b5 (diff)
downloadopenembedded-core-contrib-d911635bdcb84bb162b49bca32c7c7867e56a023.tar.gz
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>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc4
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb2
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a94c398332..6cd6d161a9 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 d97c9327a7..df3a53e11e 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