From 5615998223752efeac821d15c5b5574bf0c11ac6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 1 Dec 2011 11:48:24 +0100 Subject: pulseaudio 1.1: convert to useradd.bbclass The only thing that got lost in the conversion is the "Pulse Audio daemon" description: root@beagleboard:~# grep pulse /etc/passwd /etc/group /etc/passwd:pulse:x:999:1000::/var/run/pulse:/bin/false /etc/group:audio:x:29:pulse /etc/group:pulse:x:1000:pulse (From OE-Core rev: 2e5c7566a4b76bf3e783844cc69fd1313c6d97a4) Signed-off-by: Koen Kooi Signed-off-by: Richard Purdie --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 131d659629..4170857b64 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -16,7 +16,7 @@ SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.g file://gcc4-compile-fix.patch \ file://volatiles.04_pulse" -inherit autotools pkgconfig +inherit autotools pkgconfig useradd EXTRA_OECONF = "\ --disable-lynx \ @@ -50,6 +50,12 @@ do_install_append() { fi } +USERADD_PACKAGES = "pulseaudio-server" +GROUPADD_PARAM_pulseaudio-server = "pulse" +USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \ + --no-create-home --shell /bin/false \ + --groups audio,pulse --gid pulse pulse" + PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper" @@ -90,20 +96,12 @@ pkg_postinst_${PN}-server() { if [ "x$D" != "x" ]; then exit 1 fi - 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 ${sysconfdir}/init.d/populate-volatile.sh ] ; then ${sysconfdir}/init.d/populate-volatile.sh update fi } -pkg_postrm_${PN}-server() { - deluser pulse || true -} - python populate_packages_prepend() { #d.setVar('PKG_pulseaudio', 'pulseaudio') -- cgit v1.2.3-54-g00ecf