diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-03 13:57:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:38:09 +0000 |
commit | e47cfd447c005d2aac3cb9d2ce320b59a7c0df67 (patch) | |
tree | 0b935357414a7bdfec92a32393718c6af75b22e9 /meta/recipes-connectivity | |
parent | fc2433de1d778ff89afb569442ef990a9e54f1f9 (diff) | |
download | poky-e47cfd447c005d2aac3cb9d2ce320b59a7c0df67.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)
(From OE-Core rev: 9d0b21f0723fda0e0d287788eb79d3a70b12f949)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 61ff2bf530..04d58e2992 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc | |||
@@ -14,8 +14,7 @@ SECTION = "network" | |||
14 | # python scripts are under GPLv2+ | 14 | # python scripts are under GPLv2+ |
15 | LICENSE = "GPLv2+ & LGPLv2.1+" | 15 | LICENSE = "GPLv2+ & LGPLv2.1+" |
16 | 16 | ||
17 | INC_PR = "r8" | 17 | INC_PR = "r9" |
18 | |||
19 | DEPENDS = "expat libcap libdaemon dbus glib-2.0" | 18 | DEPENDS = "expat libcap libdaemon dbus glib-2.0" |
20 | 19 | ||
21 | SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ | 20 | SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ |
@@ -23,8 +22,9 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ | |||
23 | file://99avahi-autoipd \ | 22 | file://99avahi-autoipd \ |
24 | file://initscript.patch" | 23 | file://initscript.patch" |
25 | 24 | ||
26 | USERADD_PACKAGES = "${PN}-daemon" | 25 | USERADDPN = "avahi-daemon" |
27 | USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \ | 26 | USERADD_PACKAGES = "avahi-daemon" |
27 | USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ | ||
28 | --no-create-home --shell /bin/false \ | 28 | --no-create-home --shell /bin/false \ |
29 | --user-group avahi" | 29 | --user-group avahi" |
30 | 30 | ||