diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-29 22:24:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:38:29 +0000 |
commit | 9922ac7b808b03f037a91eae6ea5abee7092fb2b (patch) | |
tree | b7861190f34070856d445d1f29927da766b7c1d3 | |
parent | dd860e9a7a512b4c430a157ecdeea7aab00572e9 (diff) | |
download | poky-9922ac7b808b03f037a91eae6ea5abee7092fb2b.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.
(From OE-Core rev: d911635bdcb84bb162b49bca32c7c7867e56a023)
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.inc | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | 2 |
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() { | |||
95 | adduser --disabled-password --home=/var/run/pulse --system \ | 95 | adduser --disabled-password --home=/var/run/pulse --system \ |
96 | --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse | 96 | --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse |
97 | addgroup pulse audio | 97 | addgroup pulse audio |
98 | /etc/init.d/populate-volatile.sh update | 98 | if [ -e /etc/init.d/populate-volatile.sh ] ; then |
99 | /etc/init.d/populate-volatile.sh update | ||
100 | fi | ||
99 | } | 101 | } |
100 | 102 | ||
101 | pkg_postrm_${PN}-server() { | 103 | 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 @@ | |||
1 | require pulseaudio.inc | 1 | require pulseaudio.inc |
2 | 2 | ||
3 | PR = "r1" | ||
4 | |||
3 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" | 5 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" |
4 | 6 | ||
5 | inherit gettext perlnative | 7 | inherit gettext perlnative |