| Submitter | Koen Kooi |
|---|---|
| Date | May 4, 2012, 7:54 a.m. |
| Message ID | <1336118046-20901-1-git-send-email-koen@dominion.thruhere.net> |
| Download | mbox | patch |
| Permalink | /patch/27053/ |
| State | Accepted |
| Commit | 22254a32f05e9212411216bf1a4e48fd86b9c3ef |
| Headers | show |
Comments
On 05/04/2012 12:54 AM, Koen Kooi wrote: > This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. > > The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless > > The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 > > Signed-off-by: Koen Kooi<koen@dominion.thruhere.net> > --- > > If accepted into master I'd like to have this in the 'denzil' branch as well. > > meta/recipes-connectivity/connman/connman.inc | 4 ++-- > meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc > index bfe6620..8b27cfb 100644 > --- a/meta/recipes-connectivity/connman/connman.inc > +++ b/meta/recipes-connectivity/connman/connman.inc > @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ > --enable-threads \ > --enable-loopback \ > --enable-ethernet \ > - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ > - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ > + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ > + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ > --enable-dnsproxy \ > --enable-ofono \ > --enable-tools \ > diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb > index 4c57dab..d7f22b9 100644 > --- a/meta/recipes-connectivity/connman/connman_0.79.bb > +++ b/meta/recipes-connectivity/connman/connman_0.79.bb > @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ > file://test-set-ipv6-method-api-fix.patch \ > file://connman" > S = "${WORKDIR}/git" > -PR = "r3" > +PR = "r4" Merged into OE-Core Thanks Sau!
On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: > This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. > > The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless > > The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 > > Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > --- > > If accepted into master I'd like to have this in the 'denzil' branch as well. > > meta/recipes-connectivity/connman/connman.inc | 4 ++-- > meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc > index bfe6620..8b27cfb 100644 > --- a/meta/recipes-connectivity/connman/connman.inc > +++ b/meta/recipes-connectivity/connman/connman.inc > @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ > --enable-threads \ > --enable-loopback \ > --enable-ethernet \ > - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ > - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ > + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ > + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ > --enable-dnsproxy \ > --enable-ofono \ > --enable-tools \ > diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb > index 4c57dab..d7f22b9 100644 > --- a/meta/recipes-connectivity/connman/connman_0.79.bb > +++ b/meta/recipes-connectivity/connman/connman_0.79.bb > @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ > file://test-set-ipv6-method-api-fix.patch \ > file://connman" > S = "${WORKDIR}/git" > -PR = "r3" > +PR = "r4" This appears to have broken the build on qemuppc: http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio Cheers, Richard
Op 6 mei 2012, om 11:17 heeft Richard Purdie het volgende geschreven: > On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: >> This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. >> >> The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless >> >> The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 >> >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >> --- >> >> If accepted into master I'd like to have this in the 'denzil' branch as well. >> >> meta/recipes-connectivity/connman/connman.inc | 4 ++-- >> meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc >> index bfe6620..8b27cfb 100644 >> --- a/meta/recipes-connectivity/connman/connman.inc >> +++ b/meta/recipes-connectivity/connman/connman.inc >> @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ >> --enable-threads \ >> --enable-loopback \ >> --enable-ethernet \ >> - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ >> - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ >> + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ >> + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ >> --enable-dnsproxy \ >> --enable-ofono \ >> --enable-tools \ >> diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb >> index 4c57dab..d7f22b9 100644 >> --- a/meta/recipes-connectivity/connman/connman_0.79.bb >> +++ b/meta/recipes-connectivity/connman/connman_0.79.bb >> @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ >> file://test-set-ipv6-method-api-fix.patch \ >> file://connman" >> S = "${WORKDIR}/git" >> -PR = "r3" >> +PR = "r4" > > This appears to have broken the build on qemuppc: > > http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio That is really weird, since that's defined in ioctl.h in asm-generic/ by the kernel. Does qemuppc have some options for serial ports disabled in the kernel headers? Since the wl12xx is a regular wifi chip it should work on ppc, like it does on arm and x86. regards, Koen
On Sun, 2012-05-06 at 14:32 +0200, Koen Kooi wrote: > Op 6 mei 2012, om 11:17 heeft Richard Purdie het volgende geschreven: > > > On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: > >> This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. > >> > >> The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless > >> > >> The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 > >> > >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> > >> --- > >> > >> If accepted into master I'd like to have this in the 'denzil' branch as well. > >> > >> meta/recipes-connectivity/connman/connman.inc | 4 ++-- > >> meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- > >> 2 files changed, 3 insertions(+), 3 deletions(-) > >> > >> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc > >> index bfe6620..8b27cfb 100644 > >> --- a/meta/recipes-connectivity/connman/connman.inc > >> +++ b/meta/recipes-connectivity/connman/connman.inc > >> @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ > >> --enable-threads \ > >> --enable-loopback \ > >> --enable-ethernet \ > >> - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ > >> - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ > >> + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ > >> + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ > >> --enable-dnsproxy \ > >> --enable-ofono \ > >> --enable-tools \ > >> diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb > >> index 4c57dab..d7f22b9 100644 > >> --- a/meta/recipes-connectivity/connman/connman_0.79.bb > >> +++ b/meta/recipes-connectivity/connman/connman_0.79.bb > >> @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ > >> file://test-set-ipv6-method-api-fix.patch \ > >> file://connman" > >> S = "${WORKDIR}/git" > >> -PR = "r3" > >> +PR = "r4" > > > > This appears to have broken the build on qemuppc: > > > > http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio > > That is really weird, since that's defined in ioctl.h in asm-generic/ > by the kernel. Does qemuppc have some options for serial ports > disabled in the kernel headers? Since the wl12xx is a regular wifi > chip it should work on ppc, like it does on arm and x86. Its defined in ioctls.h which is a key difference. ioctls.h is a set of default ioctl options which most architectures use but architectures have their own custom definitions. PowerPC is one such architecture, using "t" instead of "T" for tty operations. It seems the powerpc version never needed a version2 so in theory #ifndef TCGETS2 #define TCGETS2 TCGETS #define termios2 termios #endif would work but google suggests some potential issues which I don't really want to dig into/understand. I'm tempted to disable this plugin on powerpc unless anyone wants to step up with a patch? Using the libc API for this would probably be more portable. Cheers, Richard
Op 7 mei 2012, om 11:44 heeft Richard Purdie het volgende geschreven: > On Sun, 2012-05-06 at 14:32 +0200, Koen Kooi wrote: >> Op 6 mei 2012, om 11:17 heeft Richard Purdie het volgende geschreven: >> >>> On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: >>>> This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. >>>> >>>> The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless >>>> >>>> The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 >>>> >>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>> --- >>>> >>>> If accepted into master I'd like to have this in the 'denzil' branch as well. >>>> >>>> meta/recipes-connectivity/connman/connman.inc | 4 ++-- >>>> meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- >>>> 2 files changed, 3 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc >>>> index bfe6620..8b27cfb 100644 >>>> --- a/meta/recipes-connectivity/connman/connman.inc >>>> +++ b/meta/recipes-connectivity/connman/connman.inc >>>> @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ >>>> --enable-threads \ >>>> --enable-loopback \ >>>> --enable-ethernet \ >>>> - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ >>>> - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ >>>> + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ >>>> + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ >>>> --enable-dnsproxy \ >>>> --enable-ofono \ >>>> --enable-tools \ >>>> diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb >>>> index 4c57dab..d7f22b9 100644 >>>> --- a/meta/recipes-connectivity/connman/connman_0.79.bb >>>> +++ b/meta/recipes-connectivity/connman/connman_0.79.bb >>>> @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ >>>> file://test-set-ipv6-method-api-fix.patch \ >>>> file://connman" >>>> S = "${WORKDIR}/git" >>>> -PR = "r3" >>>> +PR = "r4" >>> >>> This appears to have broken the build on qemuppc: >>> >>> http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio >> >> That is really weird, since that's defined in ioctl.h in asm-generic/ >> by the kernel. Does qemuppc have some options for serial ports >> disabled in the kernel headers? Since the wl12xx is a regular wifi >> chip it should work on ppc, like it does on arm and x86. > > Its defined in ioctls.h which is a key difference. > > ioctls.h is a set of default ioctl options which most architectures use > but architectures have their own custom definitions. PowerPC is one such > architecture, using "t" instead of "T" for tty operations. > > It seems the powerpc version never needed a version2 so in theory > > #ifndef TCGETS2 > #define TCGETS2 TCGETS > #define termios2 termios > #endif > > would work but google suggests some potential issues which I don't > really want to dig into/understand. > > I'm tempted to disable this plugin on powerpc That's fine by me. > unless anyone wants to > step up with a patch? Using the libc API for this would probably be more > portable. I can look into that after the next angstrom point release, which is ~2 weeks away. regards, koen
On Mon, May 7, 2012 at 3:02 AM, Koen Kooi <koen@dominion.thruhere.net> wrote: > > Op 7 mei 2012, om 11:44 heeft Richard Purdie het volgende geschreven: > >> On Sun, 2012-05-06 at 14:32 +0200, Koen Kooi wrote: >>> Op 6 mei 2012, om 11:17 heeft Richard Purdie het volgende geschreven: >>> >>>> On Fri, 2012-05-04 at 09:54 +0200, Koen Kooi wrote: >>>>> This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. >>>>> >>>>> The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless >>>>> >>>>> The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 >>>>> >>>>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> >>>>> --- >>>>> >>>>> If accepted into master I'd like to have this in the 'denzil' branch as well. >>>>> >>>>> meta/recipes-connectivity/connman/connman.inc | 4 ++-- >>>>> meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- >>>>> 2 files changed, 3 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc >>>>> index bfe6620..8b27cfb 100644 >>>>> --- a/meta/recipes-connectivity/connman/connman.inc >>>>> +++ b/meta/recipes-connectivity/connman/connman.inc >>>>> @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ >>>>> --enable-threads \ >>>>> --enable-loopback \ >>>>> --enable-ethernet \ >>>>> - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ >>>>> - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ >>>>> + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ >>>>> + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ >>>>> --enable-dnsproxy \ >>>>> --enable-ofono \ >>>>> --enable-tools \ >>>>> diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb >>>>> index 4c57dab..d7f22b9 100644 >>>>> --- a/meta/recipes-connectivity/connman/connman_0.79.bb >>>>> +++ b/meta/recipes-connectivity/connman/connman_0.79.bb >>>>> @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ >>>>> file://test-set-ipv6-method-api-fix.patch \ >>>>> file://connman" >>>>> S = "${WORKDIR}/git" >>>>> -PR = "r3" >>>>> +PR = "r4" >>>> >>>> This appears to have broken the build on qemuppc: >>>> >>>> http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/369/steps/shell_19/logs/stdio >>> >>> That is really weird, since that's defined in ioctl.h in asm-generic/ >>> by the kernel. Does qemuppc have some options for serial ports >>> disabled in the kernel headers? Since the wl12xx is a regular wifi >>> chip it should work on ppc, like it does on arm and x86. >> >> Its defined in ioctls.h which is a key difference. >> >> ioctls.h is a set of default ioctl options which most architectures use >> but architectures have their own custom definitions. PowerPC is one such >> architecture, using "t" instead of "T" for tty operations. >> >> It seems the powerpc version never needed a version2 so in theory >> >> #ifndef TCGETS2 >> #define TCGETS2 TCGETS >> #define termios2 termios >> #endif >> >> would work but google suggests some potential issues which I don't >> really want to dig into/understand. issues are only if someone throws new binaries on older kernel. I don't think thats an issue for us. above patch should be ok imo >> >> I'm tempted to disable this plugin on powerpc > > That's fine by me. > >> unless anyone wants to >> step up with a patch? Using the libc API for this would probably be more >> portable. > > I can look into that after the next angstrom point release, which is ~2 weeks away. > > regards, > > koen > _______________________________________________ > 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-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index bfe6620..8b27cfb 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -28,8 +28,8 @@ EXTRA_OECONF += "\ --enable-threads \ --enable-loopback \ --enable-ethernet \ - ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi --enable-tist', '--disable-wifi', d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth --enable-tist', '--disable-bluetooth', d)} \ --enable-dnsproxy \ --enable-ofono \ --enable-tools \ diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb index 4c57dab..d7f22b9 100644 --- a/meta/recipes-connectivity/connman/connman_0.79.bb +++ b/meta/recipes-connectivity/connman/connman_0.79.bb @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ file://test-set-ipv6-method-api-fix.patch \ file://connman" S = "${WORKDIR}/git" -PR = "r3" +PR = "r4"
This plugin manages the firmware loading for the TI wl12xx series of bluetooth/wifi/fm chips. The double --enable-tist when both bluetooth and wireless are enabled is ugly, but harmless The background on the plugin: https://bugs.meego.com/show_bug.cgi?id=8418 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- If accepted into master I'd like to have this in the 'denzil' branch as well. meta/recipes-connectivity/connman/connman.inc | 4 ++-- meta/recipes-connectivity/connman/connman_0.79.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)