ofono: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

(From OE-Core rev: 1766f851be890ec057040594a12997b1576ba1d5)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/ofono/ofono-1.12/obsolete_automake_macros.patch b/meta/recipes-connectivity/ofono/ofono-1.12/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..31a102e
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono-1.12/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Submitted [ofono@ofono.org]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd ofono-1.12/configure.ac ofono-1.12/configure.ac
+--- ofono-1.12/configure.ac    2012-12-19 21:28:44.000000000 +0200
++++ ofono-1.12/configure.ac    2013-01-12 11:18:40.681410757 +0200
+@@ -2,7 +2,7 @@
+ AC_INIT(ofono, 1.12)
+
+ AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
index c33ede4..44ab0a6 100644 (file)
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
@@ -4,8 +4,10 @@ SRC_URI  = "\
   ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
   file://ofono \
   file://missing-ssize_t.patch \
+  file://obsolete_automake_macros.patch \
 "
-PR = "r1"
+
+PR = "r2"
 
 SRC_URI[md5sum] = "aa8924c0e8de3ec7ac5e41fe7df4cb99"
 SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b3ef751"