diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-29 22:24:59 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 15:38:29 +0000 |
| commit | 4217c91abae53791c27f8236e991bff2f1557784 (patch) | |
| tree | 8fa6af1e83dddc176e782cc93048ec552fab7ce6 /meta/recipes-multimedia/pulseaudio | |
| parent | 9922ac7b808b03f037a91eae6ea5abee7092fb2b (diff) | |
| download | poky-4217c91abae53791c27f8236e991bff2f1557784.tar.gz | |
pulseaudio 1.1: replace hardcoded /etc with ${sysconfdir}
(From OE-Core rev: 82414933a98b30f48507858e7fc22b349a4f8dab)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 6cd6d161a9..131d659629 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
| @@ -90,13 +90,13 @@ pkg_postinst_${PN}-server() { | |||
| 90 | if [ "x$D" != "x" ]; then | 90 | if [ "x$D" != "x" ]; then |
| 91 | exit 1 | 91 | exit 1 |
| 92 | fi | 92 | fi |
| 93 | grep -q pulse: /etc/group || addgroup pulse | 93 | grep -q pulse: ${sysconfdir}/group || addgroup pulse |
| 94 | grep -q pulse: /etc/passwd || \ | 94 | grep -q pulse: ${sysconfdir}/passwd || \ |
| 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 | if [ -e /etc/init.d/populate-volatile.sh ] ; then | 98 | if [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then |
| 99 | /etc/init.d/populate-volatile.sh update | 99 | ${sysconfdir}/init.d/populate-volatile.sh update |
| 100 | fi | 100 | fi |
| 101 | } | 101 | } |
| 102 | 102 | ||
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb index df3a53e11e..576d2b7470 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | require pulseaudio.inc | 1 | require pulseaudio.inc |
| 2 | 2 | ||
| 3 | PR = "r1" | 3 | PR = "r2" |
| 4 | 4 | ||
| 5 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" | 5 | DEPENDS += "libjson gdbm speex libxml-parser-perl-native" |
| 6 | 6 | ||
