summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-12-01 10:48:24 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 10:53:36 (GMT)
commit5615998223752efeac821d15c5b5574bf0c11ac6 (patch)
tree209b15ccf76edd870e95cd46e2844d74f3136d74
parent80986e1182e6b1ef7eed177dfd06a884d639bd87 (diff)
downloadpoky-5615998223752efeac821d15c5b5574bf0c11ac6.tar.gz
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 <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 131d659..4170857 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
16 file://gcc4-compile-fix.patch \ 16 file://gcc4-compile-fix.patch \
17 file://volatiles.04_pulse" 17 file://volatiles.04_pulse"
18 18
19inherit autotools pkgconfig 19inherit autotools pkgconfig useradd
20 20
21EXTRA_OECONF = "\ 21EXTRA_OECONF = "\
22 --disable-lynx \ 22 --disable-lynx \
@@ -50,6 +50,12 @@ do_install_append() {
50 fi 50 fi
51} 51}
52 52
53USERADD_PACKAGES = "pulseaudio-server"
54GROUPADD_PARAM_pulseaudio-server = "pulse"
55USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
56 --no-create-home --shell /bin/false \
57 --groups audio,pulse --gid pulse pulse"
58
53PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \ 59PACKAGES =+ "libpulsecore libpulsecommon libpulsedsp libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib \
54 pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper" 60 pulseaudio-server pulseaudio-misc pulseaudio-gconf-helper"
55 61
@@ -90,20 +96,12 @@ pkg_postinst_${PN}-server() {
90 if [ "x$D" != "x" ]; then 96 if [ "x$D" != "x" ]; then
91 exit 1 97 exit 1
92 fi 98 fi
93 grep -q pulse: ${sysconfdir}/group || addgroup pulse 99
94 grep -q pulse: ${sysconfdir}/passwd || \
95 adduser --disabled-password --home=/var/run/pulse --system \
96 --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
97 addgroup pulse audio
98 if [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then 100 if [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
99 ${sysconfdir}/init.d/populate-volatile.sh update 101 ${sysconfdir}/init.d/populate-volatile.sh update
100 fi 102 fi
101} 103}
102 104
103pkg_postrm_${PN}-server() {
104 deluser pulse || true
105}
106
107python populate_packages_prepend() { 105python populate_packages_prepend() {
108 #d.setVar('PKG_pulseaudio', 'pulseaudio') 106 #d.setVar('PKG_pulseaudio', 'pulseaudio')
109 107