diff options
Diffstat (limited to 'meta/recipes-connectivity/avahi/files')
8 files changed, 241 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch b/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch new file mode 100644 index 0000000000..7590df79f0 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/0001-avahi-fix-avahi-status-command-error-prompt.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From f774ac25f436a782ccccc4dbe68378a684596799 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lu Chong <Chong.Lu@windriver.com> | ||
3 | Date: Thu, 7 Nov 2013 14:36:28 +0800 | ||
4 | Subject: [PATCH] avahi: fix avahi status command error prompt | ||
5 | |||
6 | service --status-all command will display wrong status for avahi-daemon. | ||
7 | This commit fix this error prompt and make service display right status | ||
8 | for avahi-daemon. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Lu Chong <Chong.Lu@windriver.com> | ||
13 | --- | ||
14 | initscript/debian/avahi-daemon.in | 14 +++++++++++--- | ||
15 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in | ||
18 | index 4793b46..49ec358 100755 | ||
19 | --- a/initscript/debian/avahi-daemon.in | ||
20 | +++ b/initscript/debian/avahi-daemon.in | ||
21 | @@ -153,7 +153,15 @@ d_reload() { | ||
22 | # Function that check the status of the daemon/service. | ||
23 | # | ||
24 | d_status() { | ||
25 | - $DAEMON -c && echo "$DESC is running" || echo "$DESC is not running" | ||
26 | + $DAEMON -c | ||
27 | + status=$? | ||
28 | + if [ $status = 0 ]; then | ||
29 | + echo "$DESC is running" | ||
30 | + return 0 | ||
31 | + else | ||
32 | + echo "$DESC is not running" | ||
33 | + return 3 | ||
34 | + fi | ||
35 | } | ||
36 | |||
37 | case "$1" in | ||
38 | @@ -182,9 +190,9 @@ case "$1" in | ||
39 | d_status | ||
40 | ;; | ||
41 | *) | ||
42 | - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload}" >&2 | ||
43 | + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|reload|status}" >&2 | ||
44 | exit 1 | ||
45 | ;; | ||
46 | esac | ||
47 | |||
48 | -exit 0 | ||
49 | +exit $? | ||
50 | -- | ||
51 | 1.7.9.5 | ||
52 | |||
diff --git a/meta/recipes-connectivity/avahi/files/00avahi-autoipd b/meta/recipes-connectivity/avahi/files/00avahi-autoipd new file mode 100644 index 0000000000..a0ab814603 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/00avahi-autoipd | |||
@@ -0,0 +1,10 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 | ||
4 | |||
5 | case "$1" in | ||
6 | |||
7 | deconfig|renew|bound) | ||
8 | /usr/sbin/avahi-autoipd -k $interface 2> /dev/null | ||
9 | ;; | ||
10 | esac | ||
diff --git a/meta/recipes-connectivity/avahi/files/99avahi-autoipd b/meta/recipes-connectivity/avahi/files/99avahi-autoipd new file mode 100644 index 0000000000..234cdaa3eb --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/99avahi-autoipd | |||
@@ -0,0 +1,10 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 | ||
4 | |||
5 | case "$1" in | ||
6 | |||
7 | leasefail) | ||
8 | /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null | ||
9 | ;; | ||
10 | esac | ||
diff --git a/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch b/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch new file mode 100644 index 0000000000..32f20ece43 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fixes this install issue | ||
4 | #| /bin/sh: line 0: cd: /srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/avahi-0.6.31-r3.0/image//usr/bin: No such file or directory | ||
5 | |||
6 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
7 | 2012/05/03 | ||
8 | |||
9 | Index: avahi-0.6.31/avahi-utils/Makefile.am | ||
10 | =================================================================== | ||
11 | --- avahi-0.6.31.orig/avahi-utils/Makefile.am | ||
12 | +++ avahi-0.6.31/avahi-utils/Makefile.am | ||
13 | @@ -54,6 +54,7 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS | ||
14 | avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la | ||
15 | |||
16 | install-exec-local: | ||
17 | + $(MKDIR_P) $(DESTDIR)/$(bindir) && \ | ||
18 | cd $(DESTDIR)/$(bindir) && \ | ||
19 | rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ | ||
20 | $(LN_S) avahi-resolve avahi-resolve-host-name && \ | ||
21 | Index: avahi-0.6.31/avahi-utils/Makefile.in | ||
22 | =================================================================== | ||
23 | --- avahi-0.6.31.orig/avahi-utils/Makefile.in | ||
24 | +++ avahi-0.6.31/avahi-utils/Makefile.in | ||
25 | @@ -906,6 +906,7 @@ uninstall-am: uninstall-binPROGRAMS | ||
26 | |||
27 | |||
28 | @HAVE_DBUS_TRUE@install-exec-local: | ||
29 | +@HAVE_DBUS_TRUE@ $(MKDIR_P) $(DESTDIR)/$(bindir) && \ | ||
30 | @HAVE_DBUS_TRUE@ cd $(DESTDIR)/$(bindir) && \ | ||
31 | @HAVE_DBUS_TRUE@ rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ | ||
32 | @HAVE_DBUS_TRUE@ $(LN_S) avahi-resolve avahi-resolve-host-name && \ | ||
diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch new file mode 100644 index 0000000000..0fc4c290c4 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | autoamke 1.12.x has depricated use of mkdir_p , and recommends use of MKDIR_P | ||
4 | instead. Fixed the automake files accordingly to avoid warning-errors. | ||
5 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
6 | 2012/07/09 | ||
7 | |||
8 | |||
9 | Index: avahi-0.6.31/avahi-daemon/Makefile.am | ||
10 | =================================================================== | ||
11 | --- avahi-0.6.31.orig/avahi-daemon/Makefile.am | ||
12 | +++ avahi-0.6.31/avahi-daemon/Makefile.am | ||
13 | @@ -169,7 +169,7 @@ xmllint: | ||
14 | done | ||
15 | |||
16 | install-data-local: | ||
17 | - test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run" | ||
18 | + test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run" | ||
19 | |||
20 | update-systemd: | ||
21 | curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c | ||
22 | Index: avahi-0.6.31/avahi-autoipd/Makefile.am | ||
23 | =================================================================== | ||
24 | --- avahi-0.6.31.orig/avahi-autoipd/Makefile.am | ||
25 | +++ avahi-0.6.31/avahi-autoipd/Makefile.am | ||
26 | @@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dh | ||
27 | dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d | ||
28 | |||
29 | install-exec-hook: dhclient-exit-hook dhclient-enter-hook | ||
30 | - $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir) | ||
31 | + $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir) | ||
32 | $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd | ||
33 | $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd | ||
34 | |||
diff --git a/meta/recipes-connectivity/avahi/files/initscript.patch b/meta/recipes-connectivity/avahi/files/initscript.patch new file mode 100644 index 0000000000..193889eb5c --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/initscript.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in | ||
4 | index 30a2c2f..b5848a8 100755 | ||
5 | --- a/initscript/debian/avahi-daemon.in | ||
6 | +++ b/initscript/debian/avahi-daemon.in | ||
7 | @@ -1,2 +1,14 @@ | ||
8 | #!/bin/sh | ||
9 | - | ||
10 | +### BEGIN INIT INFO | ||
11 | +# Provides: avahi | ||
12 | +# Required-Start: $remote_fs dbus | ||
13 | +# Required-Stop: $remote_fs dbus | ||
14 | +# Should-Start: $syslog | ||
15 | +# Should-Stop: $syslog | ||
16 | +# Default-Start: 2 3 4 5 | ||
17 | +# Default-Stop: 0 1 6 | ||
18 | +# Short-Description: Avahi mDNS/DNS-SD Daemon | ||
19 | +# Description: Zeroconf daemon for configuring your network | ||
20 | +# automatically | ||
21 | +### END INIT INFO | ||
22 | +# | ||
23 | diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in | ||
24 | index ac34804..f95c340 100755 | ||
25 | --- a/initscript/debian/avahi-dnsconfd.in | ||
26 | +++ b/initscript/debian/avahi-dnsconfd.in | ||
27 | @@ -1,1 +1,14 @@ | ||
28 | #!/bin/sh | ||
29 | +### BEGIN INIT INFO | ||
30 | +# Provides: avahi-dnsconfd | ||
31 | +# Required-Start: $remote_fs avahi | ||
32 | +# Required-Stop: $remote_fs avahi | ||
33 | +# Should-Start: $syslog | ||
34 | +# Should-Stop: $syslog | ||
35 | +# Default-Start: 2 3 4 5 | ||
36 | +# Default-Stop: 0 1 6 | ||
37 | +# Short-Description: Avahi mDNS/DNS-SD DNS configuration | ||
38 | +# Description: Zeroconf daemon for configuring your network | ||
39 | +# automatically | ||
40 | +### END INIT INFO | ||
41 | +# | ||
diff --git a/meta/recipes-connectivity/avahi/files/out-of-tree.patch b/meta/recipes-connectivity/avahi/files/out-of-tree.patch new file mode 100644 index 0000000000..43476cde05 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/out-of-tree.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Upstream-Status: Pending | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From a62dc95d75691ea4aefa86d8bbe54c62afd78ff6 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 17 Sep 2013 12:27:36 +0100 | ||
7 | Subject: [PATCH] build-sys: fix out-of-tree builds without xmltoman | ||
8 | |||
9 | If manpages are enabled but xmltoman isn't present, out-of-tree builds fail | ||
10 | because it checks inside the build directory for the pre-generated manpages. | ||
11 | |||
12 | Fix this by using $srcdir when looking for files inside the source directory. | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 9debce2..047c7ae 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -1021,7 +1021,7 @@ if test x$manpages = xyes ; then | ||
22 | fi | ||
23 | |||
24 | if test x$have_xmltoman = xno -o x$xmltoman = xno; then | ||
25 | - if ! test -e man/avahi-daemon.8 ; then | ||
26 | + if ! test -e $srcdir/man/avahi-daemon.8 ; then | ||
27 | AC_MSG_ERROR([*** xmltoman was not found or was disabled, it is required to build the manpages as they have not been pre-built, install xmltoman, pass --disable-manpages or dont pass --disable-xmltoman]) | ||
28 | exit 1 | ||
29 | fi | ||
30 | -- | ||
31 | 1.7.10.4 | ||
32 | |||
diff --git a/meta/recipes-connectivity/avahi/files/reuseport-check.patch b/meta/recipes-connectivity/avahi/files/reuseport-check.patch new file mode 100644 index 0000000000..bb81c2cb4e --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/reuseport-check.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Fix avahi-daemon when running on kernel < 3.9 (patch taken from Ubuntu). | ||
2 | |||
3 | Upstream-Status: Pending (unmaintained upstream) | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | Description: SO_REUSEPORT may not exist in running kernel | ||
7 | When userspace defines SO_REUSEPORT we will attempt to enable socket | ||
8 | port number reuse. However if the running kernel does not support | ||
9 | this call it will fail preventing daemon startup. If this call is | ||
10 | present but fails ENOPROTOOPT then we know that actually the kernel | ||
11 | does not support it and we should continue as if we did not have the | ||
12 | call at all. (LP: #1228204) | ||
13 | . | ||
14 | This patch could be removed from the debian package after jessie release. | ||
15 | Author: Andy Whitcroft <apw@canonical.com> | ||
16 | |||
17 | Index: avahi-0.6.31/avahi-core/socket.c | ||
18 | =================================================================== | ||
19 | --- avahi-0.6.31.orig/avahi-core/socket.c 2013-09-20 16:36:50.000000000 +0100 | ||
20 | +++ avahi-0.6.31/avahi-core/socket.c 2013-09-20 16:38:23.781863644 +0100 | ||
21 | @@ -177,7 +177,8 @@ | ||
22 | yes = 1; | ||
23 | if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0) { | ||
24 | avahi_log_warn("SO_REUSEPORT failed: %s", strerror(errno)); | ||
25 | - return -1; | ||
26 | + if (errno != ENOPROTOOPT) | ||
27 | + return -1; | ||
28 | } | ||
29 | #endif | ||
30 | |||