diff options
Diffstat (limited to 'yocto-poky/meta/recipes-connectivity/avahi/avahi.inc')
| -rw-r--r-- | yocto-poky/meta/recipes-connectivity/avahi/avahi.inc | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc b/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc index 825197d61..81aad7935 100644 --- a/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc +++ b/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc @@ -7,27 +7,24 @@ configuration from the link-local 169.254.0.0/16 range without the need for a ce server.' AUTHOR = "Lennart Poettering <lennart@poettering.net>" HOMEPAGE = "http://avahi.org" -BUGTRACKER = "http://avahi.org/report" +BUGTRACKER = "https://github.com/lathiat/avahi/issues" SECTION = "network" # major part is under LGPLv2.1+, but several .dtd, .xsl, initscripts and # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r11" +DEPENDS = "expat libcap libdaemon glib-2.0 intltool-native" -DEPENDS = "expat libcap libdaemon dbus glib-2.0" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ +SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ file://99avahi-autoipd \ file://initscript.patch \ - file://avahi_fix_install_issue.patch \ - file://fix_for_automake_1.12.x.patch \ - file://out-of-tree.patch \ - file://0001-avahi-fix-avahi-status-command-error-prompt.patch \ - file://reuseport-check.patch \ " +UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" + +PACKAGECONFIG ??= "dbus" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" USERADD_PACKAGES = "avahi-daemon avahi-autoipd" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ @@ -40,10 +37,9 @@ USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ -c \"Avahi autoip daemon\" \ avahi-autoipd" -inherit autotools pkgconfig update-rc.d gettext useradd +inherit autotools pkgconfig update-rc.d gettext useradd gobject-introspection -EXTRA_OECONF = "--disable-introspection \ - --with-avahi-priv-access-group=adm \ +EXTRA_OECONF = "--with-avahi-priv-access-group=adm \ --disable-stack-protector \ --disable-gdbm \ --disable-mono \ @@ -52,6 +48,7 @@ EXTRA_OECONF = "--disable-introspection \ --disable-qt4 \ --disable-python \ --disable-doxygen-doc \ + --disable-manpages \ ${EXTRA_OECONF_SYSVINIT} \ ${EXTRA_OECONF_SYSTEMD} \ ${AVAHI_GTK} \ @@ -68,8 +65,14 @@ LDFLAGS_append_uclinux-uclibc = " -lintl" do_configure_prepend() { sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac + + # This m4 file will get in the way of our introspection.m4 with special cross-compilation fixes + rm "${S}/common/introspection.m4" || true } +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/avahi-common/.libs:${B}/avahi-client/.libs:${B}/avahi-glib/.libs" +} PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" @@ -82,7 +85,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/udhcpc.d/00avahi-autoipd \ ${sysconfdir}/udhcpc.d/99avahi-autoipd" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core = "${libdir}/libavahi-core.so.*" +FILES_libavahi-core = "${libdir}/libavahi-core.so.* ${libdir}/girepository-1.0/AvahiCore*.typelib" FILES_avahi-daemon = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/avahi-daemon.conf \ ${sysconfdir}/avahi/hosts \ @@ -99,7 +102,7 @@ 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_libavahi-gobject = "${libdir}/libavahi-gobject.so.* ${libdir}/girepository-1.0/Avahi*.typelib" FILES_avahi-utils = "${bindir}/avahi-*" RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" @@ -130,7 +133,7 @@ do_install() { rm -rf ${D}${localstatedir}/run rmdir --ignore-fail-on-non-empty ${D}${localstatedir} rm -rf ${D}${datadir}/dbus-1/interfaces - rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 + test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 rm -rf ${D}${libdir}/avahi install -d ${D}${sysconfdir}/udhcpc.d |