summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc19
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index a0a1681ab3..d529b37996 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r5"
+INC_PR = "r6"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
@@ -26,11 +26,17 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://fix_for_automake_1.12.x.patch \
"
-USERADD_PACKAGES = "avahi-daemon"
+USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
--no-create-home --shell /bin/false \
--user-group avahi"
+USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
+ --no-create-home --shell /bin/false \
+ --user-group \
+ -c \"Avahi autoip daemon\" \
+ avahi-autoipd"
+
inherit autotools pkgconfig update-rc.d gettext useradd
EXTRA_OECONF = "--with-distro=debian \
@@ -137,15 +143,6 @@ if [ -z "$D" ]; then
fi
}
-pkg_postinst_avahi-autoipd () {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
- grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd
- grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon"
-}
-
pkg_postrm_avahi-daemon () {
deluser avahi || true
delgroup avahi || true