summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-09 20:01:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-10 00:03:59 +0000
commitdb692fd5706eab9bfd94c115591d1411cf8e196e (patch)
treeeb4a1c46d62041c9ea6a3d55e3b98d261207b281
parentc67d7c9215bd8af2b5dcc4a72b6edf00157724d5 (diff)
downloadopenembedded-core-db692fd5706eab9bfd94c115591d1411cf8e196e.tar.gz
openembedded-core-db692fd5706eab9bfd94c115591d1411cf8e196e.tar.bz2
openembedded-core-db692fd5706eab9bfd94c115591d1411cf8e196e.zip
connman: avoid checking for linux/if_alg.h header
Disable building of 'alg-test' and checking for if_alg.h header. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc8
-rw-r--r--meta/recipes-connectivity/connman/connman_0.78.bb2
2 files changed, 9 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index d695fee218..503bf1cffa 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -49,6 +49,14 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
inherit autotools pkgconfig update-rc.d useradd
+# alg-test doesn't build, so disable that and test
+# for if_alg.h as this header is only in 2.6.39
+do_configure_prepend() {
+ sed -i 's:tools/alg-test ::g' Makefile.am
+ sed -i 's:AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,::g;
+ s:AC_MSG_ERROR(User-space algorithm header files are required))::g' configure.ac
+}
+
do_compile_append() {
sed -i -e s:deny:allow:g src/connman-dbus.conf
}
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index 5ea2bb7ef2..378bd9d647 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,6 +1,6 @@
require connman.inc
-PR = "r2"
+PR = "r3"
# 0.78 tag
SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"