diff options
author | Dengke Du <dengke.du@windriver.com> | 2017-12-12 09:46:23 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-02 17:24:37 +0000 |
commit | ff6d3524c18578dcdcdb44e0a457b9c20fa91230 (patch) | |
tree | c42d98d1346904d0bfda4e9fb5cd096e7cd6aef4 /meta/recipes-connectivity/avahi/files | |
parent | bbef2327f8e006162b7978f696ddc24a9dc74e91 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-connectivity/avahi/files')
-rw-r--r-- | meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch | 29 | ||||
-rw-r--r-- | meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch | 30 |
2 files changed, 0 insertions, 59 deletions
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 @@ | |||
1 | From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Sun, 12 Jun 2016 18:32:49 +0300 | ||
4 | Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3 | ||
5 | too | ||
6 | |||
7 | Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130] | ||
8 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
9 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
10 | --- | ||
11 | configure.ac | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 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 | -- | ||
28 | 2.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 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Backport from: | ||
4 | https://github.com/experimental-platform/platform-hostname-avahi/pull/9 | ||
5 | |||
6 | It sometimes fails to run avahi with error: "Could not receive return value | ||
7 | from daemon process". It has same root cause with | ||
8 | https://github.com/lxc/lxc/issues/25. | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
11 | --- | ||
12 | From 5150983102ad5ad43f0dae203cb332c168eb5a71 Mon Sep 17 00:00:00 2001 | ||
13 | From: Hinnerk Haardt <haardt@information-control.de> | ||
14 | Date: Thu, 17 Dec 2015 11:52:19 +0100 | ||
15 | Subject: [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 | |||
22 | diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf | ||
23 | index 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 | ||