diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-03 11:31:55 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:17:39 +0100 |
| commit | eb69c7f1063174e95a42cac7c83384ea9e4bec90 (patch) | |
| tree | fe0247d56c41eb80ad7c93bf7487173ed09fb2f2 | |
| parent | 8dbb71a8bf33c6d2494dbbb74d3e944d788eca50 (diff) | |
| download | openembedded-core-eb69c7f1063174e95a42cac7c83384ea9e4bec90.tar.gz openembedded-core-eb69c7f1063174e95a42cac7c83384ea9e4bec90.tar.bz2 openembedded-core-eb69c7f1063174e95a42cac7c83384ea9e4bec90.zip | |
avahi: fix install issue
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-connectivity/avahi/files/avahi_fix_install_issue.patch | 32 |
2 files changed, 36 insertions, 2 deletions
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 <nitin.a.kamble@intel.com> +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 && \ |