From 4217c91abae53791c27f8236e991bff2f1557784 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 29 Nov 2011 22:24:59 +0100 Subject: pulseaudio 1.1: replace hardcoded /etc with ${sysconfdir} (From OE-Core rev: 82414933a98b30f48507858e7fc22b349a4f8dab) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 8 ++++---- meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-multimedia/pulseaudio') 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() { if [ "x$D" != "x" ]; then exit 1 fi - grep -q pulse: /etc/group || addgroup pulse - grep -q pulse: /etc/passwd || \ + grep -q pulse: ${sysconfdir}/group || addgroup pulse + grep -q pulse: ${sysconfdir}/passwd || \ adduser --disabled-password --home=/var/run/pulse --system \ --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse addgroup pulse audio - if [ -e /etc/init.d/populate-volatile.sh ] ; then - /etc/init.d/populate-volatile.sh update + if [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then + ${sysconfdir}/init.d/populate-volatile.sh update fi } 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 @@ require pulseaudio.inc -PR = "r1" +PR = "r2" DEPENDS += "libjson gdbm speex libxml-parser-perl-native" -- cgit v1.2.3-54-g00ecf