* [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix
@ 2013-01-15 20:08 Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 1/3] connman: upgrade to 1.10 Cristian Iorga
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Cristian Iorga @ 2013-01-15 20:08 UTC (permalink / raw)
To: openembedded-core
This set of patches will:
- update connman to 1.10
- solve the issue of lost connectivity with qemu machines
connman will clear previous configuration for a network
interface, rendering qemu machines eth0 unusable, because
there is no DHCP server to be used, and the static configuration
of eth0 will be cleared when connman starts.
connman-conf solves this.
- add machine override ability for any qemu machine
can be used for doing specific configs only for qemu* machines
Cristian Iorga (3):
connman: upgrade to 1.10
connman-conf: configures connman in qemu machines
qemu: machine override ability added
meta/conf/layer.conf | 1 +
meta/conf/machine/include/qemu.inc | 2 +
meta/recipes-connectivity/connman/connman-conf.bb | 18 ++++++
.../connman/connman-conf/qemuall/main.conf | 3 +
...If-there-is-no-d_type-support-use-fstatat.patch | 61 --------------------
...If-there-is-no-d_type-support-use-fstatat.patch | 38 +++++++-----
.../connman/inet-fix-ip-cleanup-functions.patch | 40 +++++++++++++
.../connman/{connman_1.4.bb => connman_1.10.bb} | 8 ++-
8 files changed, 91 insertions(+), 80 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
create mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
delete mode 100644 meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
create mode 100644 meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
rename meta/recipes-connectivity/connman/{connman_1.4.bb => connman_1.10.bb} (71%)
--
1.7.10.4
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V4 1/3] connman: upgrade to 1.10
2013-01-15 20:08 [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Cristian Iorga
@ 2013-01-15 20:08 ` Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 2/3] connman-conf: configures connman in qemu machines Cristian Iorga
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Cristian Iorga @ 2013-01-15 20:08 UTC (permalink / raw)
To: openembedded-core
0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
- adapted to the new version
0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
- patch removed (it is included in the new version)
inet-fix-ip-cleanup-functions.patch: added
- fix for ip cleanup functions
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
...If-there-is-no-d_type-support-use-fstatat.patch | 61 --------------------
...If-there-is-no-d_type-support-use-fstatat.patch | 38 +++++++-----
.../connman/inet-fix-ip-cleanup-functions.patch | 40 +++++++++++++
.../connman/{connman_1.4.bb => connman_1.10.bb} | 8 ++-
4 files changed, 67 insertions(+), 80 deletions(-)
delete mode 100644 meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
create mode 100644 meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
rename meta/recipes-connectivity/connman/{connman_1.4.bb => connman_1.10.bb} (71%)
diff --git a/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
deleted file mode 100644
index 3bced52..0000000
--- a/meta/recipes-connectivity/connman/connman/0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f2094e6b2e4542adf458d8fa58d7bccd5edb762e Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei@gherzan.ro>
-Date: Tue, 17 Jul 2012 17:27:39 +0300
-Subject: [PATCH V3 1/2] timezone.c: If there is no d_type support use
- fstatat()
-
-This is useful for filesystems where d_type is always DT_UNKNOWN.
-In this case use fstatat() function.
-
-Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
-Upstream-Status: Submitted
-
----
- src/timezone.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/src/timezone.c b/src/timezone.c
-index 173d658..f951f6b 100644
---- a/src/timezone.c
-+++ b/src/timezone.c
-@@ -157,6 +157,8 @@ static char *find_origin(void *src_map, struct stat *src_st,
- DIR *dir;
- struct dirent *d;
- char *str, pathname[PATH_MAX];
-+ struct stat buf;
-+ int ret;
-
- if (subpath == NULL)
- strncpy(pathname, basepath, sizeof(pathname));
-@@ -205,6 +207,28 @@ static char *find_origin(void *src_map, struct stat *src_st,
- return str;
- }
- break;
-+ case DT_UNKNOWN:
-+ /*
-+ * If there is no d_type support use fstatat()
-+ * to check if directory
-+ */
-+ ret = fstatat(dirfd(dir), d->d_name, &buf, 0);
-+ if (ret < 0)
-+ continue;
-+ if (!(buf.st_mode & S_IFDIR))
-+ continue;
-+ if (subpath == NULL)
-+ strncpy(pathname, d->d_name, sizeof(pathname));
-+ else
-+ snprintf(pathname, sizeof(pathname),
-+ "%s/%s", subpath, d->d_name);
-+
-+ str = find_origin(src_map, src_st, basepath, pathname);
-+ if (str != NULL) {
-+ closedir(dir);
-+ return str;
-+ }
-+ break;
- }
- }
-
---
-1.7.9.5
-
diff --git a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
index d3205c0..7315545 100644
--- a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
+++ b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
@@ -8,20 +8,33 @@ This is useful for filesystems where d_type is always DT_UNKNOWN.
In this case use fstatat() function.
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Upstream-Status: Submitted
---
src/storage.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
-diff --git a/src/storage.c b/src/storage.c
-index 47bd0cb..0491a52 100644
---- a/src/storage.c
-+++ b/src/storage.c
-@@ -206,6 +206,25 @@ gchar **connman_storage_get_services()
+Index: git/src/storage.c
+===================================================================
+--- git.orig/src/storage.c
++++ git/src/storage.c
+@@ -193,7 +193,6 @@ gchar **connman_storage_get_services()
- g_string_append_printf(result, "%s/", d->d_name);
- break;
+ switch (d->d_type) {
+ case DT_DIR:
+- case DT_UNKNOWN:
+ /*
+ * If the settings file is not found, then
+ * assume this directory is not a services dir.
+@@ -203,6 +202,25 @@ gchar **connman_storage_get_services()
+ ret = stat(str, &buf);
+ g_free(str);
+ if (ret < 0)
++ continue;
++
++ g_string_append_printf(result, "%s/", d->d_name);
++ break;
+ case DT_UNKNOWN:
+ /*
+ * If there is no d_type support use fstatat()
@@ -37,13 +50,6 @@ index 47bd0cb..0491a52 100644
+ ret = stat(str, &buf);
+ g_free(str);
+ if (ret < 0)
-+ continue;
-+
-+ g_string_append_printf(result, "%s/", d->d_name);
-+ break;
- }
- }
+ continue;
---
-1.7.9.5
-
+ g_string_append_printf(result, "%s/", d->d_name);
diff --git a/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch b/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
new file mode 100644
index 0000000..3071549
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/inet-fix-ip-cleanup-functions.patch
@@ -0,0 +1,40 @@
+From 100353e10f60a50ca1ba78daa6bc4dfebf5b3297 Mon Sep 17 00:00:00 2001
+From: Constantin Musca <constantinx.musca@intel.com>
+Date: Wed, 5 Dec 2012 15:07:21 +0200
+Subject: [PATCH] inet: fix ip cleanup functions
+
+Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+---
+ src/inet.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/inet.c b/src/inet.c
+index be69aca..e76a1f1 100644
+--- a/src/inet.c
++++ b/src/inet.c
+@@ -626,6 +626,10 @@ int connman_inet_clear_ipv6_address(int index, const char *address,
+
+ DBG("index %d address %s prefix_len %d", index, address, prefix_len);
+
++ if (address == NULL) {
++ return -1;
++ }
++
+ err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET6,
+ address, NULL, prefix_len, NULL);
+ if (err < 0) {
+@@ -649,6 +653,10 @@ int connman_inet_clear_address(int index, struct connman_ipaddress *ipaddress)
+
+ DBG("index %d address %s prefix_len %d", index, address, prefix_len);
+
++ if (address == NULL) {
++ return -1;
++ }
++
+ err = __connman_inet_modify_address(RTM_DELADDR, 0, index, AF_INET,
+ address, peer, prefix_len, broadcast);
+ if (err < 0) {
+--
+1.7.11.7
+
diff --git a/meta/recipes-connectivity/connman/connman_1.4.bb b/meta/recipes-connectivity/connman/connman_1.10.bb
similarity index 71%
rename from meta/recipes-connectivity/connman/connman_1.4.bb
rename to meta/recipes-connectivity/connman/connman_1.10.bb
index bd8ba65..10d5255 100644
--- a/meta/recipes-connectivity/connman/connman_1.4.bb
+++ b/meta/recipes-connectivity/connman/connman_1.10.bb
@@ -1,12 +1,14 @@
require connman.inc
-# 1.4 tag
-SRCREV = "f701bbca259f1f35e68d338f31f5373f75f3da5f"
+# 1.10 tag
+SRCREV = "3bda76eb442c9395db1dba17352c3e78376671cc"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
file://add_xuser_dbus_permission.patch \
file://connman \
file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
- file://0001-timezone.c-If-there-is-no-d_type-support-use-fstatat.patch"
+ file://inet-fix-ip-cleanup-functions.patch"
S = "${WORKDIR}/git"
PR = "${INC_PR}.0"
+
+RRECOMMENDS_${PN} = "connman-conf"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH V4 2/3] connman-conf: configures connman in qemu machines
2013-01-15 20:08 [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 1/3] connman: upgrade to 1.10 Cristian Iorga
@ 2013-01-15 20:08 ` Cristian Iorga
2013-01-15 20:15 ` Otavio Salvador
2013-01-15 20:21 ` Martin Jansa
2013-01-15 20:08 ` [PATCH V4 3/3] qemu: machine override ability added Cristian Iorga
2013-01-16 7:42 ` [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Ross Burton
3 siblings, 2 replies; 10+ messages in thread
From: Cristian Iorga @ 2013-01-15 20:08 UTC (permalink / raw)
To: openembedded-core
For qemu machines, connman should not configure
virtual wired interfaces. Wired interfaces (eth0)
are assigned static IP addresses by the virtual machine
manager (qemu). This packages places the eth0 interface in
a list of blacklisted interfaces, forbiding connman
administering wired interfaces for qemu machines.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
meta/conf/layer.conf | 1 +
meta/recipes-connectivity/connman/connman-conf.bb | 18 ++++++++++++++++++
.../connman/connman-conf/qemuall/main.conf | 3 +++
3 files changed, 22 insertions(+)
create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
create mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 78ceae9..3259e5c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
shadow-securetty \
opkg-config-base \
netbase \
+ connman-conf \
formfactor \
xserver-xf86-config \
pointercal \
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
new file mode 100644
index 0000000..7c7ef26
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-conf.bb
@@ -0,0 +1,18 @@
+#connman config to ignore wired interfaces on qemu machines
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI_append_qemuall = " file://main.conf"
+
+PR = "r0"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+ #Blacklist ethn network interface in case of qemu* machines
+ if test -e ${WORKDIR}/main.conf; then
+ install -d ${D}${sysconfdir}/connman
+ install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
+ fi
+}
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
new file mode 100644
index 0000000..01973e7
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
@@ -0,0 +1,3 @@
+[General]
+
+NetworkInterfaceBlacklist = eth
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH V4 3/3] qemu: machine override ability added
2013-01-15 20:08 [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 1/3] connman: upgrade to 1.10 Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 2/3] connman-conf: configures connman in qemu machines Cristian Iorga
@ 2013-01-15 20:08 ` Cristian Iorga
2013-01-16 7:42 ` [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Ross Burton
3 siblings, 0 replies; 10+ messages in thread
From: Cristian Iorga @ 2013-01-15 20:08 UTC (permalink / raw)
To: openembedded-core
Add override ability to qemu to allow qemu specific
configurations for any qemu machine.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
meta/conf/machine/include/qemu.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 5d59a7f..c1012ab 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -10,6 +10,8 @@ XSERVER ?= "xserver-xorg \
MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINEOVERRIDES .= ":qemuall"
+
IMAGE_FSTYPES += "tar.bz2 ext3"
ROOT_FLASH_SIZE = "280"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH V4 2/3] connman-conf: configures connman in qemu machines
2013-01-15 20:08 ` [PATCH V4 2/3] connman-conf: configures connman in qemu machines Cristian Iorga
@ 2013-01-15 20:15 ` Otavio Salvador
2013-01-15 20:18 ` Iorga, Cristian
2013-01-15 20:21 ` Martin Jansa
1 sibling, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2013-01-15 20:15 UTC (permalink / raw)
To: Cristian Iorga; +Cc: Patches and discussions about the oe-core layer
On Tue, Jan 15, 2013 at 6:08 PM, Cristian Iorga
<cristian.iorga@intel.com> wrote:
> For qemu machines, connman should not configure
> virtual wired interfaces. Wired interfaces (eth0)
> are assigned static IP addresses by the virtual machine
> manager (qemu). This packages places the eth0 interface in
> a list of blacklisted interfaces, forbiding connman
> administering wired interfaces for qemu machines.
>
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
I think this will raise a warning durig build for non-qemu machines, no?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V4 2/3] connman-conf: configures connman in qemu machines
2013-01-15 20:15 ` Otavio Salvador
@ 2013-01-15 20:18 ` Iorga, Cristian
0 siblings, 0 replies; 10+ messages in thread
From: Iorga, Cristian @ 2013-01-15 20:18 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
It didn't during my tests.
But I might be wrong.
Please let me know if there are such warnings.
Thanks,
Cristian
-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Tuesday, January 15, 2013 10:16 PM
To: Iorga, Cristian
Cc: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH V4 2/3] connman-conf: configures connman in qemu machines
On Tue, Jan 15, 2013 at 6:08 PM, Cristian Iorga <cristian.iorga@intel.com> wrote:
> For qemu machines, connman should not configure virtual wired
> interfaces. Wired interfaces (eth0) are assigned static IP addresses
> by the virtual machine manager (qemu). This packages places the eth0
> interface in a list of blacklisted interfaces, forbiding connman
> administering wired interfaces for qemu machines.
>
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
I think this will raise a warning durig build for non-qemu machines, no?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V4 2/3] connman-conf: configures connman in qemu machines
2013-01-15 20:08 ` [PATCH V4 2/3] connman-conf: configures connman in qemu machines Cristian Iorga
2013-01-15 20:15 ` Otavio Salvador
@ 2013-01-15 20:21 ` Martin Jansa
2013-01-15 20:24 ` Saul Wold
1 sibling, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2013-01-15 20:21 UTC (permalink / raw)
To: Cristian Iorga; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2847 bytes --]
On Tue, Jan 15, 2013 at 10:08:46PM +0200, Cristian Iorga wrote:
> For qemu machines, connman should not configure
> virtual wired interfaces. Wired interfaces (eth0)
> are assigned static IP addresses by the virtual machine
> manager (qemu). This packages places the eth0 interface in
> a list of blacklisted interfaces, forbiding connman
> administering wired interfaces for qemu machines.
Again wrong order,
3/3 should be 1st
2/3 2nd
1/3 3rd
Cheers,
>
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
> meta/conf/layer.conf | 1 +
> meta/recipes-connectivity/connman/connman-conf.bb | 18 ++++++++++++++++++
> .../connman/connman-conf/qemuall/main.conf | 3 +++
> 3 files changed, 22 insertions(+)
> create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
> create mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>
> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
> index 78ceae9..3259e5c 100644
> --- a/meta/conf/layer.conf
> +++ b/meta/conf/layer.conf
> @@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
> shadow-securetty \
> opkg-config-base \
> netbase \
> + connman-conf \
> formfactor \
> xserver-xf86-config \
> pointercal \
> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
> new file mode 100644
> index 0000000..7c7ef26
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman-conf.bb
> @@ -0,0 +1,18 @@
> +#connman config to ignore wired interfaces on qemu machines
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
> +
> +SRC_URI_append_qemuall = " file://main.conf"
> +
> +PR = "r0"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +do_install() {
> + #Blacklist ethn network interface in case of qemu* machines
> + if test -e ${WORKDIR}/main.conf; then
> + install -d ${D}${sysconfdir}/connman
> + install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
> + fi
> +}
> diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> new file mode 100644
> index 0000000..01973e7
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
> @@ -0,0 +1,3 @@
> +[General]
> +
> +NetworkInterfaceBlacklist = eth
> --
> 1.7.10.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V4 2/3] connman-conf: configures connman in qemu machines
2013-01-15 20:21 ` Martin Jansa
@ 2013-01-15 20:24 ` Saul Wold
2013-01-29 20:02 ` Stanacar, StefanX
0 siblings, 1 reply; 10+ messages in thread
From: Saul Wold @ 2013-01-15 20:24 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 01/15/2013 12:21 PM, Martin Jansa wrote:
> On Tue, Jan 15, 2013 at 10:08:46PM +0200, Cristian Iorga wrote:
>> For qemu machines, connman should not configure
>> virtual wired interfaces. Wired interfaces (eth0)
>> are assigned static IP addresses by the virtual machine
>> manager (qemu). This packages places the eth0 interface in
>> a list of blacklisted interfaces, forbiding connman
>> administering wired interfaces for qemu machines.
>
> Again wrong order,
>
> 3/3 should be 1st
> 2/3 2nd
> 1/3 3rd
>
I have re-ordered this in my consolidated pull MUT staging area, saw
that right away!
Sau!
> Cheers,
>
>>
>> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
>> ---
>> meta/conf/layer.conf | 1 +
>> meta/recipes-connectivity/connman/connman-conf.bb | 18 ++++++++++++++++++
>> .../connman/connman-conf/qemuall/main.conf | 3 +++
>> 3 files changed, 22 insertions(+)
>> create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
>> create mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>>
>> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
>> index 78ceae9..3259e5c 100644
>> --- a/meta/conf/layer.conf
>> +++ b/meta/conf/layer.conf
>> @@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
>> shadow-securetty \
>> opkg-config-base \
>> netbase \
>> + connman-conf \
>> formfactor \
>> xserver-xf86-config \
>> pointercal \
>> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
>> new file mode 100644
>> index 0000000..7c7ef26
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/connman/connman-conf.bb
>> @@ -0,0 +1,18 @@
>> +#connman config to ignore wired interfaces on qemu machines
>> +
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
>> +
>> +SRC_URI_append_qemuall = " file://main.conf"
>> +
>> +PR = "r0"
>> +
>> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>> +
>> +do_install() {
>> + #Blacklist ethn network interface in case of qemu* machines
>> + if test -e ${WORKDIR}/main.conf; then
>> + install -d ${D}${sysconfdir}/connman
>> + install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
>> + fi
>> +}
>> diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>> new file mode 100644
>> index 0000000..01973e7
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>> @@ -0,0 +1,3 @@
>> +[General]
>> +
>> +NetworkInterfaceBlacklist = eth
>> --
>> 1.7.10.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix
2013-01-15 20:08 [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Cristian Iorga
` (2 preceding siblings ...)
2013-01-15 20:08 ` [PATCH V4 3/3] qemu: machine override ability added Cristian Iorga
@ 2013-01-16 7:42 ` Ross Burton
3 siblings, 0 replies; 10+ messages in thread
From: Ross Burton @ 2013-01-16 7:42 UTC (permalink / raw)
To: Cristian Iorga; +Cc: openembedded-core
On Tuesday, 15 January 2013 at 20:08, Cristian Iorga wrote:
> Cristian Iorga (3):
> connman: upgrade to 1.10
> connman-conf: configures connman in qemu machines
> qemu: machine override ability added
The ordering is wrong, the qemu change needs to land before connman-conf, but assuming that Saul re-orders these when pulling Acked-by: Ross Burton <ross.burton@intel.com>.
Ross
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V4 2/3] connman-conf: configures connman in qemu machines
2013-01-15 20:24 ` Saul Wold
@ 2013-01-29 20:02 ` Stanacar, StefanX
0 siblings, 0 replies; 10+ messages in thread
From: Stanacar, StefanX @ 2013-01-29 20:02 UTC (permalink / raw)
To: Saul Wold, Martin Jansa; +Cc: openembedded-core@lists.openembedded.org
What about network in Build Appliance image? Blacklisting eth interfaces affects build appliance image too (because it's built as qemux86-64 machine usually).
Or someone who doesn't use the runqemu script and she doesn't pass a static ip to qemu because she wants to use a dhcp server (eg: dnsmasq over a bridge which contains preconfigured tun/tap devices, think server enviroment where you want to run multiple yocto vms)
An ugly fix for BA can be:
diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index 2359eca..b8255ac 100644
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -64,6 +64,8 @@ fakeroot do_populate_poky_src () {
# Use Clearlooks GTK+ theme
mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
+
+ rm -rf ${IMAGE_ROOTFS}/etc/connman/main.conf
}
IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
--
Stefan Stanacar
Yocto QA
OTC, SSD
-----Original Message-----
From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Saul Wold
Sent: Tuesday, January 15, 2013 10:25 PM
To: Martin Jansa
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH V4 2/3] connman-conf: configures connman in qemu machines
On 01/15/2013 12:21 PM, Martin Jansa wrote:
> On Tue, Jan 15, 2013 at 10:08:46PM +0200, Cristian Iorga wrote:
>> For qemu machines, connman should not configure
>> virtual wired interfaces. Wired interfaces (eth0)
>> are assigned static IP addresses by the virtual machine
>> manager (qemu). This packages places the eth0 interface in
>> a list of blacklisted interfaces, forbiding connman
>> administering wired interfaces for qemu machines.
>
> Again wrong order,
>
> 3/3 should be 1st
> 2/3 2nd
> 1/3 3rd
>
I have re-ordered this in my consolidated pull MUT staging area, saw
that right away!
Sau!
> Cheers,
>
>>
>> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
>> ---
>> meta/conf/layer.conf | 1 +
>> meta/recipes-connectivity/connman/connman-conf.bb | 18 ++++++++++++++++++
>> .../connman/connman-conf/qemuall/main.conf | 3 +++
>> 3 files changed, 22 insertions(+)
>> create mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
>> create mode 100644 meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>>
>> diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
>> index 78ceae9..3259e5c 100644
>> --- a/meta/conf/layer.conf
>> +++ b/meta/conf/layer.conf
>> @@ -22,6 +22,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
>> shadow-securetty \
>> opkg-config-base \
>> netbase \
>> + connman-conf \
>> formfactor \
>> xserver-xf86-config \
>> pointercal \
>> diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
>> new file mode 100644
>> index 0000000..7c7ef26
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/connman/connman-conf.bb
>> @@ -0,0 +1,18 @@
>> +#connman config to ignore wired interfaces on qemu machines
>> +
>> +LICENSE = "GPLv2"
>> +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
>> +
>> +SRC_URI_append_qemuall = " file://main.conf"
>> +
>> +PR = "r0"
>> +
>> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>> +
>> +do_install() {
>> + #Blacklist ethn network interface in case of qemu* machines
>> + if test -e ${WORKDIR}/main.conf; then
>> + install -d ${D}${sysconfdir}/connman
>> + install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman
>> + fi
>> +}
>> diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>> new file mode 100644
>> index 0000000..01973e7
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/main.conf
>> @@ -0,0 +1,3 @@
>> +[General]
>> +
>> +NetworkInterfaceBlacklist = eth
>> --
>> 1.7.10.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-01-29 20:19 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-15 20:08 [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 1/3] connman: upgrade to 1.10 Cristian Iorga
2013-01-15 20:08 ` [PATCH V4 2/3] connman-conf: configures connman in qemu machines Cristian Iorga
2013-01-15 20:15 ` Otavio Salvador
2013-01-15 20:18 ` Iorga, Cristian
2013-01-15 20:21 ` Martin Jansa
2013-01-15 20:24 ` Saul Wold
2013-01-29 20:02 ` Stanacar, StefanX
2013-01-15 20:08 ` [PATCH V4 3/3] qemu: machine override ability added Cristian Iorga
2013-01-16 7:42 ` [PATCH V4 0/3] connman 1.10 upgrade and qemu networking fix Ross Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox