summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-12-17 11:36:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-19 09:29:17 (GMT)
commitaa373931faba408faa11d9b10ca3de66d7be5ba6 (patch)
tree69163d84a4b1144994d20aa9278ea200c6641be1 /meta/recipes-connectivity/connman
parentba8f367610444c929de1bcb7108eaa5f6c13625f (diff)
downloadpoky-aa373931faba408faa11d9b10ca3de66d7be5ba6.tar.gz
connman: disable 'alg-test' building
'alg-test' requires 'linux/if_alg.h' header enforcing a dependency on linux-libc-headers 2.6.39 or newer. (From OE-Core rev: 507bd087375d2c0ac84e0c51196e2fe718aed339) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc8
-rw-r--r--meta/recipes-connectivity/connman/connman/disable_alg-test.patch46
-rw-r--r--meta/recipes-connectivity/connman/connman_0.78.bb3
3 files changed, 48 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index bb1b279..d1bf7cd 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -49,14 +49,6 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
49 49
50inherit autotools pkgconfig update-rc.d useradd 50inherit 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
54do_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
60do_compile_append() { 52do_compile_append() {
61 sed -i -e s:deny:allow:g src/connman-dbus.conf 53 sed -i -e s:deny:allow:g src/connman-dbus.conf
62} 54}
diff --git a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
new file mode 100644
index 0000000..c231d75
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
@@ -0,0 +1,46 @@
1From b9a20c8eb61b600ced284646a1bea588fdd8a5ea Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Fri, 16 Dec 2011 19:31:59 -0200
4Subject: [PATCH] Disable building of alg-test
5
6alg-test utility depends on linux/if_alg.h header that is only
7available on kernels >= 2.6.39.
8
9Upstream Status: Inappropriate [configuration]
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 Makefile.am | 2 +-
14 configure.ac | 3 ---
15 2 files changed, 1 insertions(+), 4 deletions(-)
16
17diff --git a/Makefile.am b/Makefile.am
18index d5a76f9..d42a766 100644
19--- a/Makefile.am
20+++ b/Makefile.am
21@@ -144,7 +144,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \
22 tools/dbus-test tools/polkit-test \
23 tools/iptables-test tools/tap-test tools/wpad-test \
24 tools/stats-tool tools/private-network-test \
25- tools/alg-test unit/test-session
26+ unit/test-session
27
28 tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
29 tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
30diff --git a/configure.ac b/configure.ac
31index f63fea8..67bfe85 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -437,9 +437,6 @@ if (test "${enable_tools}" = "yes"); then
35 AC_MSG_ERROR(GnuTLS library is required))
36 AC_SUBST(GNUTLS_CFLAGS)
37 AC_SUBST(GNUTLS_LIBS)
38-
39- AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,
40- AC_MSG_ERROR(User-space algorithm header files are required))
41 fi
42 AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
43
44--
451.7.7.3
46
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index 74c102b..c73cad9 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,11 +1,12 @@
1require connman.inc 1require connman.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5# 0.78 tag 5# 0.78 tag
6SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297" 6SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
7SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ 7SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
8 file://add_xuser_dbus_permission.patch \ 8 file://add_xuser_dbus_permission.patch \
9 file://ethernet_default.patch \ 9 file://ethernet_default.patch \
10 file://disable_alg-test.patch \
10 file://connman" 11 file://connman"
11S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"