[oe-commits] Otavio Salvador : connman: avoid checking for linux/if_alg.h header

git at git.openembedded.org git at git.openembedded.org
Sat Dec 10 00:08:22 UTC 2011


Module: openembedded-core.git
Branch: master
Commit: db692fd5706eab9bfd94c115591d1411cf8e196e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=db692fd5706eab9bfd94c115591d1411cf8e196e

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Fri Dec  9 20:01:33 2011 +0000

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 at ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/connman/connman.inc     |    8 ++++++++
 meta/recipes-connectivity/connman/connman_0.78.bb |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index d695fee..503bf1c 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 5ea2bb7..378bd9d 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"





More information about the Openembedded-commits mailing list