summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-12 16:46:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-12 16:51:28 (GMT)
commitbbc8afb2e20fad083c40c614a79e68b7fdfc5f89 (patch)
treedc922f9bfb502bc30e42d11c5bace3d55ff99986 /meta/recipes-connectivity/connman
parentfaac9eda28d519598b4b566a3150645e4594d5d4 (diff)
downloadpoky-bbc8afb2e20fad083c40c614a79e68b7fdfc5f89.tar.gz
connman: Default to enabling ethernet interfaces
This fixes various qemu image failures where connman has changed its default and would deconfigure network interfaces causing qemu images and runtime image testing to fail. (From OE-Core rev: c9a420be15d54a8494cb45d6c932b86895e94e13) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman/ethernet_default.patch22
-rw-r--r--meta/recipes-connectivity/connman/connman_0.78.bb3
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman/ethernet_default.patch b/meta/recipes-connectivity/connman/connman/ethernet_default.patch
new file mode 100644
index 0000000..d0c05d7
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/ethernet_default.patch
@@ -0,0 +1,22 @@
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_0.78.bb b/meta/recipes-connectivity/connman/connman_0.78.bb
index 378bd9d..f36f670 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.78.bb
@@ -1,10 +1,11 @@
1require connman.inc 1require connman.inc
2 2
3PR = "r3" 3PR = "r4"
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://connman" 10 file://connman"
10S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"