From e2e6f6fe07049f33cb6348780fa975162752e421 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 12 Dec 2013 13:38:32 +0100 Subject: initial commit of Enea Linux 3.1 Migrated from the internal git server on the dora-enea branch Signed-off-by: Adrian Dudau --- .../avahi/files/00avahi-autoipd | 10 +++++ .../avahi/files/99avahi-autoipd | 10 +++++ .../avahi/files/avahi_fix_install_issue.patch | 32 ++++++++++++++++ .../avahi/files/fix_for_automake_1.11.2.patch | 44 ++++++++++++++++++++++ .../avahi/files/fix_for_automake_1.12.x.patch | 34 +++++++++++++++++ .../avahi/files/initscript.patch | 41 ++++++++++++++++++++ .../avahi/files/out-of-tree.patch | 32 ++++++++++++++++ 7 files changed, 203 insertions(+) create mode 100644 meta/recipes-connectivity/avahi/files/00avahi-autoipd create mode 100644 meta/recipes-connectivity/avahi/files/99avahi-autoipd create mode 100644 meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch create mode 100644 meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch create mode 100644 meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch create mode 100644 meta/recipes-connectivity/avahi/files/initscript.patch create mode 100644 meta/recipes-connectivity/avahi/files/out-of-tree.patch (limited to 'meta/recipes-connectivity/avahi/files') 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 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + deconfig|renew|bound) + /usr/sbin/avahi-autoipd -k $interface 2> /dev/null + ;; +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 @@ +#!/bin/sh + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +case "$1" in + + leasefail) + /usr/sbin/avahi-autoipd -wD $interface 2> /dev/null + ;; +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 @@ +Upstream-Status: Pending + +Fixes this install issue +#| /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 + +Signed-Off-By: Nitin A Kamble +2012/05/03 + +Index: avahi-0.6.31/avahi-utils/Makefile.am +=================================================================== +--- avahi-0.6.31.orig/avahi-utils/Makefile.am ++++ avahi-0.6.31/avahi-utils/Makefile.am +@@ -54,6 +54,7 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS + avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la + + install-exec-local: ++ $(MKDIR_P) $(DESTDIR)/$(bindir) && \ + cd $(DESTDIR)/$(bindir) && \ + rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ + $(LN_S) avahi-resolve avahi-resolve-host-name && \ +Index: avahi-0.6.31/avahi-utils/Makefile.in +=================================================================== +--- avahi-0.6.31.orig/avahi-utils/Makefile.in ++++ avahi-0.6.31/avahi-utils/Makefile.in +@@ -906,6 +906,7 @@ uninstall-am: uninstall-binPROGRAMS + + + @HAVE_DBUS_TRUE@install-exec-local: ++@HAVE_DBUS_TRUE@ $(MKDIR_P) $(DESTDIR)/$(bindir) && \ + @HAVE_DBUS_TRUE@ cd $(DESTDIR)/$(bindir) && \ + @HAVE_DBUS_TRUE@ rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \ + @HAVE_DBUS_TRUE@ $(LN_S) avahi-resolve avahi-resolve-host-name && \ diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch new file mode 100644 index 0000000000..e7a1908a63 --- /dev/null +++ b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch @@ -0,0 +1,44 @@ +Upstream-Status: Pending + +automake version 1.11.2 has made use of dir variables more strict. +the use of pkglibdir with DATA var results in automake errors. + This commits uses pkgdatadir var instead of pkglibdir to avoid +the strict check errors. + +Fixes this error: +service-type-database/Makefile.am:21: `pkglibdir' is not a legitimate directory for `DATA' +autoreconf: automake failed with exit status: 1 +ERROR: autoreconf execution failed. + +Signed-Off-By: Nitin A Kamble +2011/12/28 + + +Index: avahi-0.6.30/service-type-database/Makefile.am +=================================================================== +--- avahi-0.6.30.orig/service-type-database/Makefile.am ++++ avahi-0.6.30/service-type-database/Makefile.am +@@ -18,13 +18,12 @@ + EXTRA_DIST=build-db.in service-types + + pkgdata_DATA=service-types +-pkglib_DATA= + + if HAVE_PYTHON + if HAVE_GDBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db ++pkgdata_DATA+=service-types.db + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ +@@ -41,7 +40,7 @@ endif + if HAVE_DBM + + noinst_SCRIPTS=build-db +-pkglib_DATA+=service-types.db.pag service-types.db.dir ++pkgdata_DATA+=service-types.db.pag service-types.db.dir + + build-db: build-db.in + $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \ 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 @@ +Upstream-Status: Pending + +autoamke 1.12.x has depricated use of mkdir_p , and recommends use of MKDIR_P +instead. Fixed the automake files accordingly to avoid warning-errors. +Signed-Off-By: Nitin A Kamble +2012/07/09 + + +Index: avahi-0.6.31/avahi-daemon/Makefile.am +=================================================================== +--- avahi-0.6.31.orig/avahi-daemon/Makefile.am ++++ avahi-0.6.31/avahi-daemon/Makefile.am +@@ -169,7 +169,7 @@ xmllint: + done + + install-data-local: +- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run" ++ test -z "$(localstatedir)/run" || $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run" + + update-systemd: + curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c +Index: avahi-0.6.31/avahi-autoipd/Makefile.am +=================================================================== +--- avahi-0.6.31.orig/avahi-autoipd/Makefile.am ++++ avahi-0.6.31/avahi-autoipd/Makefile.am +@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dh + dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d + + install-exec-hook: dhclient-exit-hook dhclient-enter-hook +- $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir) ++ $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir) + $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd + $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd + 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 @@ +Upstream-Status: Pending + +diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in +index 30a2c2f..b5848a8 100755 +--- a/initscript/debian/avahi-daemon.in ++++ b/initscript/debian/avahi-daemon.in +@@ -1,2 +1,14 @@ + #!/bin/sh +- ++### BEGIN INIT INFO ++# Provides: avahi ++# Required-Start: $remote_fs dbus ++# Required-Stop: $remote_fs dbus ++# Should-Start: $syslog ++# Should-Stop: $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: Avahi mDNS/DNS-SD Daemon ++# Description: Zeroconf daemon for configuring your network ++# automatically ++### END INIT INFO ++# +diff --git a/initscript/debian/avahi-dnsconfd.in b/initscript/debian/avahi-dnsconfd.in +index ac34804..f95c340 100755 +--- a/initscript/debian/avahi-dnsconfd.in ++++ b/initscript/debian/avahi-dnsconfd.in +@@ -1,1 +1,14 @@ + #!/bin/sh ++### BEGIN INIT INFO ++# Provides: avahi-dnsconfd ++# Required-Start: $remote_fs avahi ++# Required-Stop: $remote_fs avahi ++# Should-Start: $syslog ++# Should-Stop: $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++# Short-Description: Avahi mDNS/DNS-SD DNS configuration ++# Description: Zeroconf daemon for configuring your network ++# automatically ++### END INIT INFO ++# 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 @@ +Upstream-Status: Pending +Signed-off-by: Ross Burton + +From a62dc95d75691ea4aefa86d8bbe54c62afd78ff6 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Tue, 17 Sep 2013 12:27:36 +0100 +Subject: [PATCH] build-sys: fix out-of-tree builds without xmltoman + +If manpages are enabled but xmltoman isn't present, out-of-tree builds fail +because it checks inside the build directory for the pre-generated manpages. + +Fix this by using $srcdir when looking for files inside the source directory. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 9debce2..047c7ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1021,7 +1021,7 @@ if test x$manpages = xyes ; then + fi + + if test x$have_xmltoman = xno -o x$xmltoman = xno; then +- if ! test -e man/avahi-daemon.8 ; then ++ if ! test -e $srcdir/man/avahi-daemon.8 ; then + 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]) + exit 1 + fi +-- +1.7.10.4 + -- cgit v1.2.3-54-g00ecf