Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

[vuplus_openembedded] / packages / avahi / avahi.inc

diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 991d282..b07ef72 100644 (file)
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -4,16 +4,13 @@ HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r5"
-
-DEPENDS = "expat libdaemon dbus glib-2.0"
+DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
+DEPENDS_append_opendreambox = " libnss-mdns"
 
 # uclibc has no nss
-RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
-RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
-RDEPENDS_avahi-autoipd = "update-rc.d"
-RDEPENDS_avahi-discover = "python-avahi python-pygtk"
-RDEPENDS_python-avahi = "python-dbus"
+RRECOMMENDS_avahi-daemon_append_linux = " ${@base_conditional('DISTRO', 'opendreambox', 'libavahi-client zeroconf', 'libnss-mdns', d)}"
+RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d"
+RDEPENDS_avahi-autoipd += "update-rc.d"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://00avahi-autoipd file://99avahi-autoipd"
@@ -24,11 +21,15 @@ inherit autotools pkgconfig update-rc.d
 RDEPENDS_append = ""
 
 # TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+EXTRA_OECONF = "--with-distro=debian  --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
 AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
-PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi"
+LDFLAGS_append_linux-uclibc = " -lintl"
+LDFLAGS_append_linux-uclibcgnueabi = " -lintl "
+LDFLAGS_append_uclinux-uclibc = " -lintl"
+
+PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
@@ -47,10 +48,11 @@ FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
                         ${sysconfdir}/avahi/avahi-dnsconfd.action \
                         ${sysconfdir}/init.d/avahi-dnsconfd"
 FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
 FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
-                      ${sysconfdir}/udhcpc.d/*avahi-autoipd"
+                       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
 FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
 FILES_avahi-discover = "${bindir}/avahi-discover \
                         ${datadir}/applications/avahi-discover.desktop \
@@ -75,10 +77,11 @@ pkg_postinst_avahi-daemon () {
        grep "^avahi:" /etc/group > /dev/null || addgroup avahi
        grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
 
-       DBUSPID=`pidof dbus-daemon`
-
-       if [ "x$DBUSPID" != "x" ]; then
-               /etc/init.d/dbus-1 force-reload
+       DBUSPID="/var/run/dbus/pid"
+       if [ -f $DBUSPID ]; then
+               if ps `cat $DBUSPID` > /dev/null; then
+                       /etc/init.d/dbus-1 force-reload
+               fi
        fi
 }