summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-20 12:27:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:03:05 +0100
commit84e5d581226ab5daf72722214bc58c35c1bdfe7f (patch)
treef8bca912a0b93af2ab289df9283102baf4ed72b2
parent36f08d973fda175c4bfc661acbb1e1d872fe3dc1 (diff)
downloadpoky-84e5d581226ab5daf72722214bc58c35c1bdfe7f.tar.gz
connman: upgrade to 1.0
Drop patches that have been merged upstream, or are not relevant any more. License checksums changed because the (C) years were updated. (From OE-Core rev: d7e7d38a2beded17937e330adf4edb89807bfdd4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman/disable_alg-test.patch46
-rw-r--r--meta/recipes-connectivity/connman/connman/ethernet_default.patch22
-rw-r--r--meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch50
-rw-r--r--meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch55
-rw-r--r--meta/recipes-connectivity/connman/connman_1.0.bb (renamed from meta/recipes-connectivity/connman/connman_0.79.bb)10
6 files changed, 5 insertions, 182 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7215f2564b..ae26689d5d 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -11,7 +11,7 @@ HOMEPAGE = "http://connman.net/"
11BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman" 11BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman"
12LICENSE = "GPLv2" 12LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" 14 file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d"
15 15
16# we need to define the depends here, the dynamic stuff is too late 16# we need to define the depends here, the dynamic stuff is too late
17DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ 17DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r8" 23INC_PR = "r9"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
diff --git a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
deleted file mode 100644
index f5cea0047d..0000000000
--- a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 3ebba424d56919018733064ad9e0ab8790d2bf1d 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 a6509f1..93618a3 100644
19--- a/Makefile.am
20+++ b/Makefile.am
21@@ -145,7 +145,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 unit/test-ippool \
26+ unit/test-session unit/test-ippool \
27 unit/test-nat
28
29 tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
30diff --git a/configure.ac b/configure.ac
31index 3dca02e..3b2da4d 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -419,9 +419,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.9.1
46
diff --git a/meta/recipes-connectivity/connman/connman/ethernet_default.patch b/meta/recipes-connectivity/connman/connman/ethernet_default.patch
deleted file mode 100644
index 6dae2aa0c8..0000000000
--- a/meta/recipes-connectivity/connman/connman/ethernet_default.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Default to enabling the ethernet interface. If we don't do this, connman
2will shut down all the networking when it starts without any configuration
3which is usualy not what the users expects. This is particularly
4problematic with our qemu images and runtime testing using qemu.
5
6Upstream-Status: Inappropriate [Configuration]
7
8RP 2011/12/12
9
10Index: git/src/storage.c
11===================================================================
12--- git.orig/src/storage.c 2011-12-12 16:14:10.892316565 +0000
13+++ git/src/storage.c 2011-12-12 16:14:13.788316431 +0000
14@@ -367,7 +367,7 @@
15 "Enable", FALSE);
16
17 g_key_file_set_boolean(keyfile, "Wired",
18- "Enable", FALSE);
19+ "Enable", TRUE);
20
21 g_key_file_set_boolean(keyfile, "3G",
22 "Enable", FALSE);
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
deleted file mode 100644
index 78eb19a770..0000000000
--- a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 0b817dd3096f5c3ca8f0b868ee55ea550054137b Mon Sep 17 00:00:00 2001
2From: Daniel Wagner <daniel.wagner@bmw-carit.de>
3Date: Mon, 19 Mar 2012 14:03:27 +0100
4Subject: [PATCH 3/3] set-ipv4-method: The arguments have to be wrapped into a
5 variant
6
7Fixes BMC#24986
8
9Upstream-Status: Backport
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 test/set-ipv4-method | 11 +++++++----
14 1 file changed, 7 insertions(+), 4 deletions(-)
15
16diff --git a/test/set-ipv4-method b/test/set-ipv4-method
17index 820b24b..235113f 100755
18--- a/test/set-ipv4-method
19+++ b/test/set-ipv4-method
20@@ -3,6 +3,9 @@
21 import sys
22 import dbus
23
24+def make_variant(string):
25+ return dbus.String(string, variant_level=1)
26+
27 def print_usage():
28 print "Usage: %s <service> [off|dhcp|manual <address> [netmask] [gateway]]" % (sys.argv[0])
29
30@@ -20,13 +23,13 @@ properties = service.GetProperties()
31
32 print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
33
34-ipv4_configuration = { "Method": sys.argv[2] }
35+ipv4_configuration = { "Method": make_variant(sys.argv[2]) }
36 if (len(sys.argv) > 3):
37- ipv4_configuration["Address"] = sys.argv[3]
38+ ipv4_configuration["Address"] = make_variant(sys.argv[3])
39 if (len(sys.argv) > 4):
40- ipv4_configuration["Netmask"] = sys.argv[4]
41+ ipv4_configuration["Netmask"] = make_variant(sys.argv[4])
42 if (len(sys.argv) > 5):
43- ipv4_configuration["Gateway"] = sys.argv[5]
44+ ipv4_configuration["Gateway"] = make_variant(sys.argv[5])
45
46 service.SetProperty("IPv4.Configuration", ipv4_configuration)
47 print "New IPv4.Configuration: ", ipv4_configuration
48--
491.7.9.5
50
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
deleted file mode 100644
index 773127bcec..0000000000
--- a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 2885e71c9c0df7ea9866e91ab79d255eaa8de53d Mon Sep 17 00:00:00 2001
2From: Daniel Wagner <daniel.wagner@bmw-carit.de>
3Date: Mon, 19 Mar 2012 14:03:28 +0100
4Subject: [PATCH 2/3] set-ipv6-method: The arguments have to be wrapped into a
5 variant
6
7Fixes BMC#24986
8
9Upstream-Status: Backport
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 test/set-ipv6-method | 13 ++++++++-----
14 1 file changed, 8 insertions(+), 5 deletions(-)
15
16diff --git a/test/set-ipv6-method b/test/set-ipv6-method
17index 7f60b88..4f2de09 100755
18--- a/test/set-ipv6-method
19+++ b/test/set-ipv6-method
20@@ -3,6 +3,9 @@
21 import sys
22 import dbus
23
24+def make_variant(string):
25+ return dbus.String(string, variant_level=1)
26+
27 def print_usage():
28 print "Usage: %s <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (sys.argv[0])
29
30@@ -19,17 +22,17 @@ properties = service.GetProperties()
31
32 print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
33
34-ipv6_configuration = { "Method": sys.argv[2] }
35+ipv6_configuration = { "Method": make_variant(sys.argv[2])}
36 if sys.argv[2] == "auto":
37 if (len(sys.argv) > 3):
38- ipv6_configuration["Privacy"] = sys.argv[3]
39+ ipv6_configuration["Privacy"] = make_variant(sys.argv[3])
40 else:
41 if (len(sys.argv) > 3):
42- ipv6_configuration["Address"] = sys.argv[3]
43+ ipv6_configuration["Address"] = make_variant(sys.argv[3])
44 if (len(sys.argv) > 4):
45- ipv6_configuration["PrefixLength"] = sys.argv[4]
46+ ipv6_configuration["PrefixLength"] = make_variant(sys.argv[4])
47 if (len(sys.argv) > 5):
48- ipv6_configuration["Gateway"] = sys.argv[5]
49+ ipv6_configuration["Gateway"] = make_variant(sys.argv[5])
50
51 service.SetProperty("IPv6.Configuration", ipv6_configuration)
52 print "New IPv6.Configuration: ", ipv6_configuration
53--
541.7.9.5
55
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_1.0.bb
index 898fb11f07..926d22e711 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_1.0.bb
@@ -1,14 +1,10 @@
1require connman.inc 1require connman.inc
2 2
3# 0.79 tag 3# 1.0 tag
4SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c" 4SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f"
5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ 5SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
6 file://add_xuser_dbus_permission.patch \
7 file://ethernet_default.patch \
8 file://disable_alg-test.patch \
9 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 6 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
10 file://test-set-ipv4-method-api-fix.patch \ 7 file://add_xuser_dbus_permission.patch \
11 file://test-set-ipv6-method-api-fix.patch \
12 file://connman" 8 file://connman"
13S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
14PR = "${INC_PR}.0" 10PR = "${INC_PR}.0"