mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
avahi: fix build with automake 1.12.1
added a new patch : fix_for_automake_1.12.x.patch More information in the patch header. (From OE-Core rev: d2662016e5f767c1c2a2d264c10634db600ddc02) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
33ec0e115c
commit
2fa4618bcf
@@ -14,7 +14,7 @@ SECTION = "network"
|
|||||||
# python scripts are under GPLv2+
|
# python scripts are under GPLv2+
|
||||||
LICENSE = "GPLv2+ & LGPLv2.1+"
|
LICENSE = "GPLv2+ & LGPLv2.1+"
|
||||||
|
|
||||||
INC_PR = "r4"
|
INC_PR = "r5"
|
||||||
|
|
||||||
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
|
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
|
|||||||
file://99avahi-autoipd \
|
file://99avahi-autoipd \
|
||||||
file://initscript.patch \
|
file://initscript.patch \
|
||||||
file://avahi_fix_install_issue.patch \
|
file://avahi_fix_install_issue.patch \
|
||||||
|
file://fix_for_automake_1.12.x.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
USERADD_PACKAGES = "avahi-daemon"
|
USERADD_PACKAGES = "avahi-daemon"
|
||||||
|
|||||||
@@ -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 <nitin.a.kamble@intel.com>
|
||||||
|
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
|
||||||
|
|
||||||
Reference in New Issue
Block a user