From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com ([143.182.124.37]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Sod5S-0006rV-EZ for Openembedded-core@lists.openembedded.org; Tue, 10 Jul 2012 18:14:54 +0200 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga102.ch.intel.com with ESMTP; 10 Jul 2012 09:03:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="120803460" Received: from yocto-hm1.jf.intel.com ([10.23.232.32]) by AZSMGA002.ch.intel.com with ESMTP; 10 Jul 2012 09:03:39 -0700 From: nitin.a.kamble@intel.com To: Openembedded-core@lists.openembedded.org Date: Tue, 10 Jul 2012 09:02:05 -0700 Message-Id: <8583e77cf1c3a904e2d4ccb8822cd5b545463c0c.1341935782.git.nitin.a.kamble@intel.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 05/19] avahi: fix build with automake 1.12.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 16:14:55 -0000 From: Nitin A Kamble added a new patch : fix_for_automake_1.12.x.patch More information in the patch header. Signed-off-by: Nitin A Kamble --- meta/recipes-connectivity/avahi/avahi.inc | 3 +- .../avahi/files/fix_for_automake_1.12.x.patch | 34 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-connectivity/avahi/files/fix_for_automake_1.12.x.patch diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index c118758..37ff70d 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -14,7 +14,7 @@ SECTION = "network" # python scripts are under GPLv2+ LICENSE = "GPLv2+ & LGPLv2.1+" -INC_PR = "r4" +INC_PR = "r5" 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://initscript.patch \ file://avahi_fix_install_issue.patch \ + file://fix_for_automake_1.12.x.patch \ " USERADD_PACKAGES = "avahi-daemon" 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 0000000..0fc4c29 --- /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 + -- 1.7.3.4