[PATCH 0/3] ofono fixes

[PATCH 0/3] ofono fixes

[Jukka Rissanen]

Hi,

Patch 1 enables systemd support which was missing from the ofono
recipe.

Patch 2 moves bluetooth enabling from .bb file into ofono.inc so
it needs to be done in only one place.

Patch 3 enables test scripts which are very useful for getting
cellular contexts up and running.

Cheers,
Jukka


Jukka Rissanen (3):
  ofono: Add systemd support
  ofono: Enable bluetooth automatically
  ofono: Enable test scripts by default

 meta/recipes-connectivity/ofono/ofono.inc     | 17 +++++++++++++----
 meta/recipes-connectivity/ofono/ofono_1.12.bb |  4 ----
 meta/recipes-connectivity/ofono/ofono_git.bb  |  4 ----
 3 files changed, 13 insertions(+), 12 deletions(-)

-- 
1.7.11.7

[PATCH 1/3] ofono: Add systemd support

[Jukka Rissanen]

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
 meta/recipes-connectivity/ofono/ofono.inc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 21e564c..7852337 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -5,16 +5,23 @@ LICENSE  = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee"
 
-inherit autotools pkgconfig update-rc.d
+inherit autotools pkgconfig update-rc.d systemd
 
 DEPENDS  = "dbus glib-2.0 udev mobile-broadband-provider-info ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}"
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
 
+EXTRA_OECONF += "\
+    ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
+"
+SYSTEMD_SERVICE_${PN} = "ofono.service"
+
 do_install_append() {
-  install -d ${D}${sysconfdir}/init.d/
-  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+    if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+        install -d ${D}${sysconfdir}/init.d/
+        install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+    fi
 }
 
 PACKAGES =+ "${PN}-tests"
-- 
1.7.11.7

[PATCH 2/3] ofono: Enable bluetooth automatically

[Jukka Rissanen]

Moving the bluetooth enabling to ofono.inc from .bb file as
it makes more sense to have bluetooth always checked.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
 meta/recipes-connectivity/ofono/ofono.inc     | 1 +
 meta/recipes-connectivity/ofono/ofono_1.12.bb | 1 -
 meta/recipes-connectivity/ofono/ofono_git.bb  | 4 ----
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 7852337..d825496 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -14,6 +14,7 @@ INITSCRIPT_PARAMS = "defaults 22"
 
 EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
 "
 SYSTEMD_SERVICE_${PN} = "ofono.service"
 
diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
index 44ab0a6..32c8bc2 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
@@ -14,6 +14,5 @@ SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b
 
 EXTRA_OECONF += "\
     --enable-test \
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
 "
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
diff --git a/meta/recipes-connectivity/ofono/ofono_git.bb b/meta/recipes-connectivity/ofono/ofono_git.bb
index f79f34f..db0bf73 100644
--- a/meta/recipes-connectivity/ofono/ofono_git.bb
+++ b/meta/recipes-connectivity/ofono/ofono_git.bb
@@ -8,10 +8,6 @@ PR = "r5"
 SRC_URI  = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
 	    file://ofono"
 
-EXTRA_OECONF += "\
-    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
-"
-
 do_configure_prepend () {
   ${S}/bootstrap
 }
-- 
1.7.11.7

[PATCH 3/3] ofono: Enable test scripts by default

[Jukka Rissanen]

oFono test scripts are very useful so enable those by default.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
---
 meta/recipes-connectivity/ofono/ofono.inc     | 3 ++-
 meta/recipes-connectivity/ofono/ofono_1.12.bb | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index d825496..c5bd4d0 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -15,6 +15,7 @@ INITSCRIPT_PARAMS = "defaults 22"
 EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
+    --enable-test \
 "
 SYSTEMD_SERVICE_${PN} = "ofono.service"
 
@@ -30,5 +31,5 @@ PACKAGES =+ "${PN}-tests"
 RDEPENDS_${PN} += "dbus"
 
 FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
-FILES_${PN}-tests = "${libdir}/ofono"
+FILES_${PN}-tests = "${libdir}/${BPN}/test"
 RDEPENDS_${PN}-tests = "python python-pygobject python-dbus"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
index 32c8bc2..ad524a0 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
@@ -12,7 +12,4 @@ PR = "r2"
 SRC_URI[md5sum] = "aa8924c0e8de3ec7ac5e41fe7df4cb99"
 SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b3ef751"
 
-EXTRA_OECONF += "\
-    --enable-test \
-"
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
-- 
1.7.11.7

Re: [PATCH 0/3] ofono fixes

[Burton, Ross]

On 26 July 2013 13:35, Jukka Rissanen <jukka.rissanen@linux.intel.com> wrote:
> Patch 1 enables systemd support which was missing from the ofono
> recipe.
>
> Patch 2 moves bluetooth enabling from .bb file into ofono.inc so
> it needs to be done in only one place.
>
> Patch 3 enables test scripts which are very useful for getting
> cellular contexts up and running.

All looks good, thanks Jukka.

Acked-By: Ross Burton <ross.burton@intel.com>

Ross

Re: [PATCH 3/3] ofono: Enable test scripts by default

[Saul Wold]

On 07/26/2013 05:35 AM, Jukka Rissanen wrote:
> oFono test scripts are very useful so enable those by default.
>
> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
> ---
>   meta/recipes-connectivity/ofono/ofono.inc     | 3 ++-
>   meta/recipes-connectivity/ofono/ofono_1.12.bb | 3 ---
>   2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
> index d825496..c5bd4d0 100644
> --- a/meta/recipes-connectivity/ofono/ofono.inc
> +++ b/meta/recipes-connectivity/ofono/ofono.inc
> @@ -15,6 +15,7 @@ INITSCRIPT_PARAMS = "defaults 22"
>   EXTRA_OECONF += "\
>       ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
>       ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
> +    --enable-test \
>   "
>   SYSTEMD_SERVICE_${PN} = "ofono.service"
>
> @@ -30,5 +31,5 @@ PACKAGES =+ "${PN}-tests"
>   RDEPENDS_${PN} += "dbus"
>
>   FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
> -FILES_${PN}-tests = "${libdir}/ofono"
> +FILES_${PN}-tests = "${libdir}/${BPN}/test"
I think you should be using the ptest here instead of test and inherit 
ptest, please see the ptest.bbclass.

I realize that this is not new code, but if we are going to changes this 
we should use the new ptest mechanism.

Sau!

>   RDEPENDS_${PN}-tests = "python python-pygobject python-dbus"
> diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
> index 32c8bc2..ad524a0 100644
> --- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
> +++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
> @@ -12,7 +12,4 @@ PR = "r2"
>   SRC_URI[md5sum] = "aa8924c0e8de3ec7ac5e41fe7df4cb99"
>   SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b3ef751"
>
> -EXTRA_OECONF += "\
> -    --enable-test \
> -"
>   CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
>

Re: [PATCH 3/3] ofono: Enable test scripts by default

[Jukka Rissanen]

Hi Saul,

On 26.07.2013 21:52, Saul Wold wrote:
> On 07/26/2013 05:35 AM, Jukka Rissanen wrote:
>> oFono test scripts are very useful so enable those by default.
>>
>> Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
>> ---
>>   meta/recipes-connectivity/ofono/ofono.inc     | 3 ++-
>>   meta/recipes-connectivity/ofono/ofono_1.12.bb | 3 ---
>>   2 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/ofono/ofono.inc
>> b/meta/recipes-connectivity/ofono/ofono.inc
>> index d825496..c5bd4d0 100644
>> --- a/meta/recipes-connectivity/ofono/ofono.inc
>> +++ b/meta/recipes-connectivity/ofono/ofono.inc
>> @@ -15,6 +15,7 @@ INITSCRIPT_PARAMS = "defaults 22"
>>   EXTRA_OECONF += "\
>>       ${@base_contains('DISTRO_FEATURES', 'systemd',
>> '--with-systemdunitdir=${systemd_unitdir}/system/',
>> '--with-systemdunitdir=', d)} \
>>       ${@base_contains('DISTRO_FEATURES',
>> 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
>> +    --enable-test \
>>   "
>>   SYSTEMD_SERVICE_${PN} = "ofono.service"
>>
>> @@ -30,5 +31,5 @@ PACKAGES =+ "${PN}-tests"
>>   RDEPENDS_${PN} += "dbus"
>>
>>   FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}"
>> -FILES_${PN}-tests = "${libdir}/ofono"
>> +FILES_${PN}-tests = "${libdir}/${BPN}/test"
> I think you should be using the ptest here instead of test and inherit
> ptest, please see the ptest.bbclass.
>
> I realize that this is not new code, but if we are going to changes this
> we should use the new ptest mechanism.
>
> Sau!
>

If I am reading https://wiki.yoctoproject.org/wiki/Ptest correctly, the 
ptest if for running the package test suite. Unfortunately the 
ofono-tests package is not for that purpose, it is just a bunch of 
useful python scripts for setting up cellular modem, context and 
monitoring ofono signals etc.
Similar scripts are also found in connman and neard packages.


Cheers,
Jukka

Re: [PATCH 3/3] ofono: Enable test scripts by default

[Burton, Ross]

On 29 July 2013 07:51, Jukka Rissanen <jukka.rissanen@linux.intel.com> wrote:
>> I think you should be using the ptest here instead of test and inherit
>> ptest, please see the ptest.bbclass.
>>
>> I realize that this is not new code, but if we are going to changes this
>> we should use the new ptest mechanism.
>
> If I am reading https://wiki.yoctoproject.org/wiki/Ptest correctly, the
> ptest if for running the package test suite. Unfortunately the ofono-tests
> package is not for that purpose, it is just a bunch of useful python scripts
> for setting up cellular modem, context and monitoring ofono signals etc.
> Similar scripts are also found in connman and neard packages.

You're right Jukka, whilst ptest is something that everyone should be
considering it's for test suites that typically run at "make check",
these are not that.

Ross

Re: [PATCH 1/3] ofono: Add systemd support

[Muhammad Shakeel]

On 07/26/2013 05:35 PM, Jukka Rissanen wrote:
>   do_install_append() {
> -  install -d ${D}${sysconfdir}/init.d/
> -  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
> +    if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
> +        install -d ${D}${sysconfdir}/init.d/
> +        install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
> +    fi
>   }
>   
>   PACKAGES =+ "${PN}-tests"
We won't need above 'sysvinit' check as we are trying to implement this 
for all packages through systemd class. Please see this: 
http://patches.openembedded.org/patch/54671/

Regards,
Shakeel

Re: [PATCH 1/3] ofono: Add systemd support

[Jukka Rissanen]

On 29.07.2013 12:43, Muhammad Shakeel wrote:
> On 07/26/2013 05:35 PM, Jukka Rissanen wrote:
>>   do_install_append() {
>> -  install -d ${D}${sysconfdir}/init.d/
>> -  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
>> +    if
>> ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
>> +        install -d ${D}${sysconfdir}/init.d/
>> +        install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
>> +    fi
>>   }
>>   PACKAGES =+ "${PN}-tests"
> We won't need above 'sysvinit' check as we are trying to implement this
> for all packages through systemd class. Please see this:
> http://patches.openembedded.org/patch/54671/

There is an issue here as I am using ofono.inc in separate ofono recipe 
where I do not have ofono init script.
In that case I need to move the do_install_append() from ofono.inc to 
ofono_1.12.bb file in order to reuse the ofono.inc.

I will send v2 after your patchset is committed.


Cheers,
Jukka

Re: [PATCH 1/3] ofono: Add systemd support

[Saul Wold]

On 07/30/2013 03:30 AM, Jukka Rissanen wrote:
> On 29.07.2013 12:43, Muhammad Shakeel wrote:
>> On 07/26/2013 05:35 PM, Jukka Rissanen wrote:
>>>   do_install_append() {
>>> -  install -d ${D}${sysconfdir}/init.d/
>>> -  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
>>> +    if
>>> ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
>>> +        install -d ${D}${sysconfdir}/init.d/
>>> +        install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
>>> +    fi
>>>   }
>>>   PACKAGES =+ "${PN}-tests"
>> We won't need above 'sysvinit' check as we are trying to implement this
>> for all packages through systemd class. Please see this:
>> http://patches.openembedded.org/patch/54671/
>
> There is an issue here as I am using ofono.inc in separate ofono recipe
> where I do not have ofono init script.
> In that case I need to move the do_install_append() from ofono.inc to
> ofono_1.12.bb file in order to reuse the ofono.inc.
>
> I will send v2 after your patchset is committed.
>
This patchset is not getting committed as is, it's pending your address 
this issue and fixing the commit message of the 2nd patch enabling 
bluetooth, which was mentioned elsewhere.

The commit is wrong, it's not enabling bluetooth automatically, it's 
moving the code from .bb to .inc.

Thanks
	Sau!

>
> Cheers,
> Jukka
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>