summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-10 12:04:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-15 08:10:14 +0000
commitf1fd0a24b368eccfd3e9b235de50bff83c25ad7b (patch)
tree43c21330ecefe1b00c3bfabe45ed4c67d5e81c70
parent42d2beec096b6c52b798ac79b78463ad9386d476 (diff)
downloadpoky-f1fd0a24b368eccfd3e9b235de50bff83c25ad7b.tar.gz
bluez4: 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: e4e3fc72fdfc7cde4652c562a936ef473c35367a) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.101.bb6
2 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..1068f2482a
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Backport
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd bluez-4.101/configure.ac bluez-4.101/configure.ac
5--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
6+++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
7@@ -2,7 +2,7 @@
8 AC_INIT(bluez, 4.101)
9
10 AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index 4225999ec8..3ea2f2548c 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -1,10 +1,12 @@
1require bluez4.inc 1require bluez4.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5SRC_URI += "file://bluetooth.conf \ 5SRC_URI += "file://bluetooth.conf \
6 file://sbc_mmx.patch \ 6 file://sbc_mmx.patch \
7 file://fix-udev-paths.patch" 7 file://fix-udev-paths.patch \
8 file://obsolete_automake_macros.patch \
9"
8 10
9SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" 11SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
10SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487" 12SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"