[meta][PATCH] ofono: run oe-stylize over recipe

[meta][PATCH] ofono: run oe-stylize over recipe

[Nicola Lunghi]

From: Nicola Lunghi <nick83ola@gmail.com>

Variable ordering changed slightly and add the SRC_URI to the inc file

Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
---
 meta/recipes-connectivity/ofono/ofono.inc     | 32 +++++++++++--------
 meta/recipes-connectivity/ofono/ofono_1.30.bb |  6 ++--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index bdbb0b5bc6..bbf31c3a9d 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -1,28 +1,31 @@
-HOMEPAGE = "http://www.ofono.org"
-SUMMARY  = "open source telephony"
+SUMMARY = "open source telephony"
 DESCRIPTION = "oFono is a stack for mobile telephony devices on Linux. oFono supports speaking to telephony devices through specific drivers, or with generic AT commands."
-LICENSE  = "GPLv2"
+HOMEPAGE = "http://www.ofono.org"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee"
+DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell"
 
-inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data
+SRC_URI = "\
+    ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+    file://ofono \
+"
 
-DEPENDS  = "dbus glib-2.0 udev mobile-broadband-provider-info ell"
+inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"
+SYSTEMD_SERVICE_${PN} = "ofono.service"
 
 PACKAGECONFIG ??= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
-    "
+"
 PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir="
 PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5"
 
 EXTRA_OECONF += "--enable-test --enable-external-ell"
 
-SYSTEMD_SERVICE_${PN} = "ofono.service"
-
 do_install_append() {
   install -d ${D}${sysconfdir}/init.d/
   install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
@@ -30,10 +33,13 @@ do_install_append() {
 
 PACKAGES =+ "${PN}-tests"
 
-RDEPENDS_${PN} += "dbus"
-RRECOMMENDS_${PN} += "kernel-module-tun mobile-broadband-provider-info"
-
 FILES_${PN} += "${systemd_unitdir}"
 FILES_${PN}-tests = "${libdir}/${BPN}/test"
-RDEPENDS_${PN}-tests = "python3-core python3-dbus"
-RDEPENDS_${PN}-tests += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)}"
+
+RDEPENDS_${PN} += "dbus"
+RDEPENDS_${PN}-tests = "\
+    python3-core \
+    python3-dbus \
+    ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-pygobject', '', d)} \
+"
+RRECOMMENDS_${PN} += "kernel-module-tun mobile-broadband-provider-info"
diff --git a/meta/recipes-connectivity/ofono/ofono_1.30.bb b/meta/recipes-connectivity/ofono/ofono_1.30.bb
index c916cb1b22..71c33e1287 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.30.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.30.bb
@@ -1,9 +1,7 @@
 require ofono.inc
 
-SRC_URI  = "\
-  ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-  file://ofono \
-  file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
+SRC_URI_append = " \
+    file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \
 "
 SRC_URI[md5sum] = "2b1ce11a4db1f4b5c8cd96eb7e96ba0c"
 SRC_URI[sha256sum] = "8079735efc5d7f33be9e792e791f2f7ff75c31ce67d477b994673e32319eec5c"
-- 
2.20.1

Re: [meta][PATCH] ofono: run oe-stylize over recipe

[Ross Burton]

On 03/10/2019 17:40, Nicola Lunghi wrote:
> From: Nicola Lunghi <nick83ola@gmail.com>
> 
> Variable ordering changed slightly and add the SRC_URI to the inc file

If you're tidying up the recipe we might as well merge the bb and inc 
file, as the inc is pointless.

Ross

[meta][PATCH] ofono: run oe-stylize over recipe

[nick83ola]

[-- Attachment #1: Type: text/plain, Size: 822 bytes --]

Hi Ross,
yes I was thinking the same thing.
Also the init file has some issue.

Last thing: there's any particular reason why is better to use a tar.gz
instead of git?
Because git makes creating patches a lot easier.

Thanks
Nick


On Fri, 4 Oct 2019 at 16:46, Ross Burton <ross.burton@intel.com> wrote:

> On 03/10/2019 17:40, Nicola Lunghi wrote:
> > From: Nicola Lunghi <nick83ola@gmail.com>
> >
> > Variable ordering changed slightly and add the SRC_URI to the inc file
>
> If you're tidying up the recipe we might as well merge the bb and inc
> file, as the inc is pointless.
>
> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 1594 bytes --]