diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-09 20:01:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-10 00:04:03 +0000 |
| commit | 488e8ba01971a2f80be92924e4dc561b3518fee8 (patch) | |
| tree | 48cef93365609e81ab13ebbd5c34bd03db704d07 | |
| parent | af7fbd6083f4b5f1770e58fe0a2262951037c176 (diff) | |
| download | poky-488e8ba01971a2f80be92924e4dc561b3518fee8.tar.gz | |
connman: avoid checking for linux/if_alg.h header
Disable building of 'alg-test' and checking for if_alg.h header.
(From OE-Core rev: db692fd5706eab9bfd94c115591d1411cf8e196e)
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.inc | 8 | ||||
| -rw-r--r-- | 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 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 \ | |||
| 49 | 49 | ||
| 50 | inherit autotools pkgconfig update-rc.d useradd | 50 | inherit autotools pkgconfig update-rc.d useradd |
| 51 | 51 | ||
| 52 | # alg-test doesn't build, so disable that and test | ||
| 53 | # for if_alg.h as this header is only in 2.6.39 | ||
| 54 | do_configure_prepend() { | ||
| 55 | sed -i 's:tools/alg-test ::g' Makefile.am | ||
| 56 | sed -i 's:AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,::g; | ||
| 57 | s:AC_MSG_ERROR(User-space algorithm header files are required))::g' configure.ac | ||
| 58 | } | ||
| 59 | |||
| 52 | do_compile_append() { | 60 | do_compile_append() { |
| 53 | sed -i -e s:deny:allow:g src/connman-dbus.conf | 61 | sed -i -e s:deny:allow:g src/connman-dbus.conf |
| 54 | } | 62 | } |
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 @@ | |||
| 1 | require connman.inc | 1 | require connman.inc |
| 2 | 2 | ||
| 3 | PR = "r2" | 3 | PR = "r3" |
| 4 | 4 | ||
| 5 | # 0.78 tag | 5 | # 0.78 tag |
| 6 | SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" | 6 | SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" |
