summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-03-13 21:47:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:03:12 (GMT)
commite8d1d3d32276e25edf3f3c496bfdcc5dac2430a3 (patch)
tree9bd7433af30b038216600f201e134d9e23707dd2 /meta/recipes-connectivity/avahi
parent1bdd2e0d764acc71a7266295b2673284b481e751 (diff)
downloadpoky-e8d1d3d32276e25edf3f3c496bfdcc5dac2430a3.tar.gz
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 <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 d7b9ed8..2c12053 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 \
6 6
7require avahi.inc 7require avahi.inc
8 8
9PR = "${INC_PR}.3" 9PR = "${INC_PR}.0"
10
11SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
12SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
10 13
11DEPENDS += "avahi gtk+ libglade" 14DEPENDS += "avahi gtk+ libglade"
12 15
@@ -34,9 +37,6 @@ RDEPENDS_avahi-discover = "python-avahi python-pygtk"
34RDEPENDS_python-avahi = "python-dbus" 37RDEPENDS_python-avahi = "python-dbus"
35 38
36 39
37SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
38SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
39
40do_install_append () { 40do_install_append () {
41 rm ${D}${sysconfdir} -rf 41 rm ${D}${sysconfdir} -rf
42 rm ${D}${base_libdir} -rf 42 rm ${D}${base_libdir} -rf
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5e29b9c..0308095 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,15 +14,14 @@ SECTION = "network"
14# python scripts are under GPLv2+ 14# python scripts are under GPLv2+
15LICENSE = "GPLv2+ & LGPLv2.1+" 15LICENSE = "GPLv2+ & LGPLv2.1+"
16 16
17INC_PR = "r11" 17INC_PR = "r0"
18 18
19DEPENDS = "expat libcap libdaemon dbus glib-2.0" 19DEPENDS = "expat libcap libdaemon dbus glib-2.0"
20 20
21SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ 21SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
22 file://00avahi-autoipd \ 22 file://00avahi-autoipd \
23 file://99avahi-autoipd \ 23 file://99avahi-autoipd \
24 file://initscript.patch \ 24 file://initscript.patch"
25 file://fix_for_automake_1.11.2.patch"
26 25
27USERADD_PACKAGES = "avahi-daemon" 26USERADD_PACKAGES = "avahi-daemon"
28USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 27USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
@@ -113,6 +112,7 @@ do_install() {
113 # if /var/run become non-empty in the future, need to install it via volatile 112 # if /var/run become non-empty in the future, need to install it via volatile
114 rm -rf ${D}/var/run 113 rm -rf ${D}/var/run
115 rm -rf ${D}${datadir}/dbus-1/interfaces 114 rm -rf ${D}${datadir}/dbus-1/interfaces
115 rm -rf ${D}/usr/lib/avahi
116} 116}
117 117
118do_install_avahi-autoipd() { 118do_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 692a5df..e56bb1d 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 \
8 8
9PR = "${INC_PR}.0" 9PR = "${INC_PR}.0"
10 10
11SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
12SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
13
11DEPENDS += "intltool-native" 14DEPENDS += "intltool-native"
12 15
13PACKAGES =+ "libavahi-gobject" 16PACKAGES =+ "libavahi-gobject"
14
15SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
16SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"