From e8d1d3d32276e25edf3f3c496bfdcc5dac2430a3 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 13 Mar 2012 14:47:42 -0700 Subject: avahi: Update to 0.6.31 Removed unneeded patch, because the issue was fixed upstream (From OE-Core rev: b535d953b08c54411a998e7527b4c2323720fcbf) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb | 63 ---------------------- meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb | 63 ++++++++++++++++++++++ meta/recipes-connectivity/avahi/avahi.inc | 6 +-- meta/recipes-connectivity/avahi/avahi_0.6.30.bb | 16 ------ meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 16 ++++++ 5 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb create mode 100644 meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb delete mode 100644 meta/recipes-connectivity/avahi/avahi_0.6.30.bb create mode 100644 meta/recipes-connectivity/avahi/avahi_0.6.31.bb (limited to 'meta/recipes-connectivity/avahi') diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb deleted file mode 100644 index d7b9ed8c9c..0000000000 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb +++ /dev/null @@ -1,63 +0,0 @@ -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" - -require avahi.inc - -PR = "${INC_PR}.3" - -DEPENDS += "avahi gtk+ libglade" - -AVAHI_GTK = "--enable-gtk --disable-gtk3" - -S = "${WORKDIR}/avahi-${PV}" - -PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone" - -FILES_${PN} = "${libdir}/libavahi-ui*.so.*" -FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" -FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" -FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" - -FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" - -FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" -FILES_avahi-discover = "${bindir}/avahi-discover \ - ${datadir}/applications/avahi-discover.desktop \ - ${datadir}/avahi/interfaces/avahi-discover*" -FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ - ${datadir}/avahi/interfaces/avahi-discover.glade" - -RDEPENDS_avahi-discover = "python-avahi python-pygtk" -RDEPENDS_python-avahi = "python-dbus" - - -SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43" -SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f" - -do_install_append () { - rm ${D}${sysconfdir} -rf - rm ${D}${base_libdir} -rf - rm ${D}${base_libdir} -rf - rm ${D}${bindir}/avahi-b* - rm ${D}${bindir}/avahi-p* - rm ${D}${bindir}/avahi-r* - rm ${D}${bindir}/avahi-s* - rm ${D}${includedir}/avahi-c* -rf - rm ${D}${includedir}/avahi-g* -rf - rm ${D}${libdir}/libavahi-c* - rm ${D}${libdir}/libavahi-g* - rm ${D}${libdir}/pkgconfig/avahi-c* - rm ${D}${libdir}/pkgconfig/avahi-g* - rm ${D}${sbindir} -rf - rm ${D}${datadir}/avahi/a* - rm ${D}${datadir}/avahi/s* - rm ${D}${datadir}/dbus* -rf - rm ${D}${mandir}/man1/a* - rm ${D}${mandir}/man5 -rf - rm ${D}${mandir}/man8 -rf - rmdir ${D}${localstatedir} -} - diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb new file mode 100644 index 0000000000..2c12053049 --- /dev/null +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb @@ -0,0 +1,63 @@ +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" + +require avahi.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d" +SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48" + +DEPENDS += "avahi gtk+ libglade" + +AVAHI_GTK = "--enable-gtk --disable-gtk3" + +S = "${WORKDIR}/avahi-${PV}" + +PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone" + +FILES_${PN} = "${libdir}/libavahi-ui*.so.*" +FILES_${PN}-dbg += "${libdir}/.debug/libavah-ui*" +FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" +FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" + +FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" + +FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" +FILES_avahi-discover = "${bindir}/avahi-discover \ + ${datadir}/applications/avahi-discover.desktop \ + ${datadir}/avahi/interfaces/avahi-discover*" +FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ + ${datadir}/avahi/interfaces/avahi-discover.glade" + +RDEPENDS_avahi-discover = "python-avahi python-pygtk" +RDEPENDS_python-avahi = "python-dbus" + + +do_install_append () { + rm ${D}${sysconfdir} -rf + rm ${D}${base_libdir} -rf + rm ${D}${base_libdir} -rf + rm ${D}${bindir}/avahi-b* + rm ${D}${bindir}/avahi-p* + rm ${D}${bindir}/avahi-r* + rm ${D}${bindir}/avahi-s* + rm ${D}${includedir}/avahi-c* -rf + rm ${D}${includedir}/avahi-g* -rf + rm ${D}${libdir}/libavahi-c* + rm ${D}${libdir}/libavahi-g* + rm ${D}${libdir}/pkgconfig/avahi-c* + rm ${D}${libdir}/pkgconfig/avahi-g* + rm ${D}${sbindir} -rf + rm ${D}${datadir}/avahi/a* + rm ${D}${datadir}/avahi/s* + rm ${D}${datadir}/dbus* -rf + rm ${D}${mandir}/man1/a* + rm ${D}${mandir}/man5 -rf + rm ${D}${mandir}/man8 -rf + rmdir ${D}${localstatedir} +} + diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 5e29b9c802..0308095794 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,15 +14,14 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r11" +INC_PR = "r0" DEPENDS = "expat libcap libdaemon dbus glib-2.0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ file://99avahi-autoipd \ - file://initscript.patch \ - file://fix_for_automake_1.11.2.patch" + file://initscript.patch" USERADD_PACKAGES = "avahi-daemon" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ @@ -113,6 +112,7 @@ do_install() { # if /var/run become non-empty in the future, need to install it via volatile rm -rf ${D}/var/run rm -rf ${D}${datadir}/dbus-1/interfaces + rm -rf ${D}/usr/lib/avahi } do_install_avahi-autoipd() { diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.30.bb deleted file mode 100644 index 692a5df9a3..0000000000 --- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb +++ /dev/null @@ -1,16 +0,0 @@ -require avahi.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ - file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ - file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ - file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" - -PR = "${INC_PR}.0" - -DEPENDS += "intltool-native" - -PACKAGES =+ "libavahi-gobject" - -SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43" -SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f" diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb new file mode 100644 index 0000000000..e56bb1d504 --- /dev/null +++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb @@ -0,0 +1,16 @@ +require avahi.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \ + file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \ + file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ + file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d" +SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48" + +DEPENDS += "intltool-native" + +PACKAGES =+ "libavahi-gobject" -- cgit v1.2.3-54-g00ecf