Patchwork [V4,2/3] connman-conf: configures connman in qemu machines

login
register
mail settings
Submitter Stanacar, StefanX
Date Jan. 29, 2013, 8:02 p.m.
Message ID <81551E10643BEC4899D6BA2541201B624B2CD5@IRSMSX104.ger.corp.intel.com>
Download mbox | patch
Permalink /patch/43659/
State New
Headers show

Comments

Stanacar, StefanX - Jan. 29, 2013, 8:02 p.m.
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:



--
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
>

Patch

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; "