summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-04-04 12:18:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:06 (GMT)
commitc1bfbf7168ac414927c2ba993444ffd3802b99a8 (patch)
treec4c5dcca3c25b839268cd42fe867294329b2e3dd /meta/recipes-connectivity/connman
parent5a7d852a94e78cf3461ab7e6c94d385147624b9d (diff)
downloadpoky-c1bfbf7168ac414927c2ba993444ffd3802b99a8.tar.gz
connman: backport test script fixes
Those fixes are required to get the test scripts to work with current 0.79 DBus API. (From OE-Core rev: aadeb3199d1b34369b63810696b9d61a86afb31d) 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/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_0.79.bb4
3 files changed, 108 insertions, 1 deletions
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
new file mode 100644
index 0000000..78eb19a
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
@@ -0,0 +1,50 @@
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
new file mode 100644
index 0000000..773127b
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
@@ -0,0 +1,55 @@
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_0.79.bb
index da48e94..4c57dab 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -7,6 +7,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
7 file://ethernet_default.patch \ 7 file://ethernet_default.patch \
8 file://disable_alg-test.patch \ 8 file://disable_alg-test.patch \
9 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 9 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
10 file://test-set-ipv4-method-api-fix.patch \
11 file://test-set-ipv6-method-api-fix.patch \
10 file://connman" 12 file://connman"
11S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
12PR = "r2" 14PR = "r3"