summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-03 12:57:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-03 14:48:50 (GMT)
commit53b3b40b1fd85f843212cd25055dba1cde91103f (patch)
tree3d61cf003e9aced1db1147f60f8703587e198ce5 /meta/recipes-connectivity/avahi
parent649ca88b2cc26ece0713e9a85d0fee1069a597db (diff)
downloadpoky-53b3b40b1fd85f843212cd25055dba1cde91103f.tar.gz
avahi: fix useradd race condition
Avahi doesn't work at boot because of: + sh /OE/../rootfs/var/lib/opkg/info/avahi-daemon.preinst Running useradd commands... grep: /OE/../rootfs/etc/passwd: No such file or directory That is due to: Package: avahi-daemon Version: 0.6.30-r9.0 [..] Depends: libavahi-core7 (>= 0.6.30), libdaemon0 (>= 0.14), libcap2 (>= 2.22), libavahi-common3 (>= 0.6.30), libdbus-1-3 (>= 1.4.12), sysvinit-pidof, libc6 (>= 2.12), libexpat1 (>= 2.0.1) After this patch: Package: avahi-daemon Version: 0.6.30-r10.0 [..] Depends: libavahi-core7 (>= 0.6.30), libdaemon0 (>= 0.14), libcap2 (>= 2.22), libavahi-common3 (>= 0.6.30), libdbus-1-3 (>= 1.4.12), sysvinit-pidof, libc6 (>= 2.12), shadow, libexpat1 (>= 2.0.1), base-passwd This also changes ${PN}-daemon to avahi-daemon to be consistent with the PACKAGES/FILES lines below (From OE-Core rev: f01fbc17b5d9bf9a227d64fe858014376cd19432) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 79cfd73..728c38f 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
14# python scripts are under GPLv2+ 14# python scripts are under GPLv2+
15LICENSE = "GPLv2+ & LGPLv2.1+" 15LICENSE = "GPLv2+ & LGPLv2.1+"
16 16
17INC_PR = "r9" 17INC_PR = "r10"
18 18
19DEPENDS = "expat libcap libdaemon dbus glib-2.0" 19DEPENDS = "expat libcap libdaemon dbus glib-2.0"
20 20
@@ -23,8 +23,9 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
23 file://99avahi-autoipd \ 23 file://99avahi-autoipd \
24 file://initscript.patch" 24 file://initscript.patch"
25 25
26USERADD_PACKAGES = "${PN}-daemon" 26USERADDPN = "avahi-daemon"
27USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \ 27USERADD_PACKAGES = "avahi-daemon"
28USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
28 --no-create-home --shell /bin/false \ 29 --no-create-home --shell /bin/false \
29 --user-group avahi" 30 --user-group avahi"
30 31