From 2f4eb4658e98185d5a2812df69850915f365d675 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 3 May 2012 11:31:55 -0700 Subject: avahi: fix install issue (From OE-Core rev: eb69c7f1063174e95a42cac7c83384ea9e4bec90) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi.inc | 6 ++-- .../avahi/files/avahi_fix_install_issue.patch | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index c064e03b81..c118758b98 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,14 +14,16 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r3" +INC_PR = "r4" DEPENDS = "expat libcap libdaemon dbus glib-2.0" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd \ file://99avahi-autoipd \ - file://initscript.patch" + file://initscript.patch \ + file://avahi_fix_install_issue.patch \ + " USERADD_PACKAGES = "avahi-daemon" USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ 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 && \ -- cgit v1.2.3-54-g00ecf