aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-13 14:47:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 12:49:24 +0000
commitb535d953b08c54411a998e7527b4c2323720fcbf (patch)
treeefbe382ca3463a3b073a59132aa1703ce05a3482 /meta/recipes-connectivity/avahi
parent29fe4e2e396166ced1a8b79f7254b24e0e727db1 (diff)
downloadopenembedded-core-b535d953b08c54411a998e7527b4c2323720fcbf.tar.gz
avahi: Update to 0.6.31
Removed unneeded patch, because the issue was fixed upstream Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb (renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb)8
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc6
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.6.31.bb (renamed from meta/recipes-connectivity/avahi/avahi_0.6.30.bb)6
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
index d7b9ed8c9c..2c12053049 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb
@@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
require avahi.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
DEPENDS += "avahi gtk+ libglade"
@@ -34,9 +37,6 @@ 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
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.31.bb
index 692a5df9a3..e56bb1d504 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
PR = "${INC_PR}.0"
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
+
DEPENDS += "intltool-native"
PACKAGES =+ "libavahi-gobject"
-
-SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
-SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"