[PATCH v2 0/4] ofono fixes

[PATCH v2 0/4] ofono fixes

[Jukka Rissanen]

Hi,

v2:
- removed sysvinit check from patch 1 as it is no longer needed
  because of commit 3b9b8d571da6bb3652427e8ccc7948cbcec0e517
- added patch 4 so that ofono.inc can be re-used by separate
  ofono recipe that does not have or use ofono initscript
- fixed the commit message in patch 2

v1:
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 (4):
  ofono: Add systemd support
  ofono: Move bluetooth enabling to .inc file
  ofono: Enable test scripts by default
  ofono: Move do_install() to ofono recipe file

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

-- 
1.7.11.7

[PATCH v2 1/4] ofono: Add systemd support

[Jukka Rissanen]

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

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 21e564c..b0e8020 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -5,13 +5,18 @@ 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
-- 
1.7.11.7

[PATCH v2 2/4] ofono: Move bluetooth enabling to .inc file

[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 b0e8020..7adc667 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 v2 3/4] 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 7adc667..3972e06 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"
 
@@ -28,5 +29,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

[PATCH v2 4/4] ofono: Move do_install() to ofono recipe file

[Jukka Rissanen]

This allows the ofono.inc file to be used by a recipe that does
not have or use ofono init script.

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

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 3972e06..5e98be9 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -19,11 +19,6 @@ EXTRA_OECONF += "\
 "
 SYSTEMD_SERVICE_${PN} = "ofono.service"
 
-do_install_append() {
-  install -d ${D}${sysconfdir}/init.d/
-  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
-}
-
 PACKAGES =+ "${PN}-tests"
 
 RDEPENDS_${PN} += "dbus"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.12.bb b/meta/recipes-connectivity/ofono/ofono_1.12.bb
index ad524a0..8f5c341 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.12.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.12.bb
@@ -13,3 +13,8 @@ SRC_URI[md5sum] = "aa8924c0e8de3ec7ac5e41fe7df4cb99"
 SRC_URI[sha256sum] = "733b75bfd1b2a1925b6de532989c496b8ae17a746691120ef64cceb00b3ef751"
 
 CFLAGS_append_libc-uclibc = " -D_GNU_SOURCE"
+
+do_install_append() {
+  install -d ${D}${sysconfdir}/init.d/
+  install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
+}
-- 
1.7.11.7

Re: [PATCH v2 4/4] ofono: Move do_install() to ofono recipe file

[Burton, Ross]

On 1 August 2013 16:01, Jukka Rissanen <jukka.rissanen@linux.intel.com> wrote:
> This allows the ofono.inc file to be used by a recipe that does
> not have or use ofono init script.

I'm not keen on this.  I presume the situation here is that your
distro has an updated ofono that doesn't have an init script, because
your distro is systemd-only.  Can't your overlaid recipe ship a stub
init script (touch files/ofono) to be installed that will get deleted
by systemd.bbclass?

Ross

Re: [PATCH v2 4/4] ofono: Move do_install() to ofono recipe file

[Jukka Rissanen]

Hi Ross,

On 01.08.2013 20:04, Burton, Ross wrote:
> On 1 August 2013 16:01, Jukka Rissanen <jukka.rissanen@linux.intel.com> wrote:
>> This allows the ofono.inc file to be used by a recipe that does
>> not have or use ofono init script.
>
> I'm not keen on this.  I presume the situation here is that your
> distro has an updated ofono that doesn't have an init script, because
> your distro is systemd-only.  Can't your overlaid recipe ship a stub
> init script (touch files/ofono) to be installed that will get deleted
> by systemd.bbclass?
>
> Ross
>

Sure, that is what I am doing atm. It would have been nice if I could 
delete the useless init script but that is very minor issue. So just 
ignore this patch 4.


Cheers,
Jukka