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>

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index a94c398332a7851e43adaed58fabc895e5cb7979..6cd6d161a961fe80285c74f772d0e428ac4f0185 100644 (file)
--- 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 d97c9327a7a258ece5aaf3da0a06cb83908e66df..df3a53e11e16b5c409c29546e1fbd578fdeb5149 100644 (file)
--- 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