summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDengke Du <dengke.du@windriver.com>2017-12-12 09:46:23 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:37 +0000
commitff6d3524c18578dcdcdb44e0a457b9c20fa91230 (patch)
treec42d98d1346904d0bfda4e9fb5cd096e7cd6aef4
parentbbef2327f8e006162b7978f696ddc24a9dc74e91 (diff)
downloadpoky-ff6d3524c18578dcdcdb44e0a457b9c20fa91230.tar.gz
avahi: upgrade to 0.7
Delete the unneeded patch, because the upstream contains the needed changes. The new version of avahi 0.7 use "/run" directory to place some run-time variable data, not /var/run, so in avahi.inc, we should remove the "/run" not "/var/run". Remove PACKAGECONFIG for pygtk which already dropped in upstream. (From OE-Core rev: 80b408ae48eb091fc2af8b1570a7aac3cdc0b009) Signed-off-by: Dengke Du <dengke.du@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.7.bb (renamed from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb)6
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc14
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.7.bb (renamed from meta/recipes-connectivity/avahi/avahi_0.6.32.bb)6
-rw-r--r--meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch29
-rw-r--r--meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch30
5 files changed, 8 insertions, 77 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
index ac364618e4..5648e386b3 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
@@ -9,9 +9,8 @@ require avahi.inc
9inherit distro_features_check 9inherit distro_features_check
10ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 10ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
11 11
12SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch" 12SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
13SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" 13SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
14SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
15 14
16DEPENDS += "avahi" 15DEPENDS += "avahi"
17 16
@@ -52,7 +51,6 @@ do_install_append () {
52 rm ${D}${libdir}/pkgconfig/avahi-g* 51 rm ${D}${libdir}/pkgconfig/avahi-g*
53 rm ${D}${sbindir} -rf 52 rm ${D}${sbindir} -rf
54 rm ${D}${datadir}/avahi/a* 53 rm ${D}${datadir}/avahi/a*
55 rm ${D}${datadir}/avahi/s*
56 rm ${D}${datadir}/locale/ -rf 54 rm ${D}${datadir}/locale/ -rf
57 rm ${D}${datadir}/dbus* -rf 55 rm ${D}${datadir}/dbus* -rf
58 rm ${D}${mandir}/man1/a* 56 rm ${D}${mandir}/man1/a*
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 7814464940..ef655dec44 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -23,21 +23,20 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}
23 " 23 "
24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" 24UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/"
25 25
26# For gtk related PACKAGECONFIGs: gtk, gtk3 and pygtk 26# For gtk related PACKAGECONFIGs: gtk, gtk3
27AVAHI_GTK ?= "" 27AVAHI_GTK ?= ""
28 28
29PACKAGECONFIG ??= "dbus ${AVAHI_GTK}" 29PACKAGECONFIG ??= "dbus ${AVAHI_GTK}"
30PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 30PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
31PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" 31PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+"
32PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" 32PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3"
33PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk,"
34 33
35USERADD_PACKAGES = "avahi-daemon avahi-autoipd" 34USERADD_PACKAGES = "avahi-daemon avahi-autoipd"
36USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 35USERADD_PARAM_avahi-daemon = "--system --home /run/avahi-daemon \
37 --no-create-home --shell /bin/false \ 36 --no-create-home --shell /bin/false \
38 --user-group avahi" 37 --user-group avahi"
39 38
40USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ 39USERADD_PARAM_avahi-autoipd = "--system --home /run/avahi-autoipd \
41 --no-create-home --shell /bin/false \ 40 --no-create-home --shell /bin/false \
42 --user-group \ 41 --user-group \
43 -c \"Avahi autoip daemon\" \ 42 -c \"Avahi autoip daemon\" \
@@ -125,12 +124,7 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
125 124
126do_install() { 125do_install() {
127 autotools_do_install 126 autotools_do_install
128 127 rm -rf ${D}/run
129 # don't install /var/run when populating rootfs. Do it through volatile
130 # /var/run of current version is empty, so just remove it.
131 # if /var/run become non-empty in the future, need to install it via volatile
132 rm -rf ${D}${localstatedir}/run
133 rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
134 rm -rf ${D}${datadir}/dbus-1/interfaces 128 rm -rf ${D}${datadir}/dbus-1/interfaces
135 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 129 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
136 rm -rf ${D}${libdir}/avahi 130 rm -rf ${D}${libdir}/avahi
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb
index bfa63044ea..7c91f10f11 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
12 file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ 12 file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \
13 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" 13 file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
14 14
15SRC_URI += "file://avahi-fix-resource-unavaiable.patch" 15SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6"
16 16SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804"
17SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013"
18SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454"
19 17
20DEPENDS += "intltool-native" 18DEPENDS += "intltool-native"
21 19
diff --git a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
deleted file mode 100644
index 942607a846..0000000000
--- a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Sun, 12 Jun 2016 18:32:49 +0300
4Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3
5 too
6
7Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130]
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Signed-off-by: Dengke Du <dengke.du@windriver.com>
10---
11 configure.ac | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/configure.ac b/configure.ac
15index 87a9a17..9860dcc 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -965,7 +965,7 @@ AC_SUBST(avahi_socket)
19 #
20 # Avahi interfaces dir
21 #
22-if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes"; then
23+if test "x$HAVE_PYTHON_DBUS" = "xyes" -o "x$HAVE_GTK" = "xyes" -o "x$HAVE_GTK3" = "xyes"; then
24 interfacesdir="${datadir}/${PACKAGE}/interfaces/"
25 AC_SUBST(interfacesdir)
26 fi
27--
282.8.1
29
diff --git a/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch b/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch
deleted file mode 100644
index 5a2fd75f55..0000000000
--- a/meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1Upstream-Status: Backport
2
3Backport from:
4https://github.com/experimental-platform/platform-hostname-avahi/pull/9
5
6It sometimes fails to run avahi with error: "Could not receive return value
7from daemon process". It has same root cause with
8https://github.com/lxc/lxc/issues/25.
9
10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11---
12From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001
13From: Hinnerk Haardt <haardt@information-control.de>
14Date: Thu, 17 Dec 2015 11:52:19 +0100
15Subject: [PATCH] Fix `chroot.c: fork() failed: Resource temporarily
16 unavailable` as per https://github.com/lxc/lxc/issues/25.
17
18---
19 avahi-daemon/avahi-daemon.conf | 1 -
20 1 file changed, 1 deletion(-)
21
22diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf
23index 95166f8..3d5b7a6 100644
24--- a/avahi-daemon/avahi-daemon.conf
25+++ b/avahi-daemon/avahi-daemon.conf
26@@ -65,4 +65,3 @@ rlimit-data=4194304
27 rlimit-fsize=0
28 rlimit-nofile=768
29 rlimit-stack=4194304
30-rlimit-nproc=3