[meta-gnome] folks: disable tests; fix dependencies

Message ID 20220125062503.19073-1-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome] folks: disable tests; fix dependencies | expand

Commit Message

Markus Volk Jan. 25, 2022, 6:25 a.m. UTC
disable tests and remove the now unneeded python3 dbusmock module
add libebook dependency to all backends that need it
---
 meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Khem Raj Jan. 25, 2022, 5:21 p.m. UTC | #1
On 1/24/22 10:25 PM, Markus Volk wrote:
> disable tests and remove the now unneeded python3 dbusmock module
> add libebook dependency to all backends that need it
> ---
>   meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb
> index 7dc72f822..1144ea8fc 100644
> --- a/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb
> +++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb
> @@ -7,7 +7,6 @@ DEPENDS = " \
>       glib-2.0 \
>       libgee \
>       libxml2 \
> -    python3-dbusmock-native \
>   "
>   
>   GNOMEBASEBUILDCLASS = "meson"
> @@ -16,14 +15,16 @@ GNOMEBASEBUILDCLASS = "meson"
>   REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
>   GIR_MESON_OPTION = ""
>   
> +EXTRA_OEMESON += "-Dtests=false"

this could also be a packageconfig, which is enabled when ptest is in 
DISTRO_FEATURE

> +
>   PACKAGECONFIG[eds] = "-Deds_backend=true,-Deds_backend=false,evolution-data-server"
> -PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false"
> -PACKAGECONFIG[ofono] = "-Dofono_backend=true,-Dofono_backend=false"
> +PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-data-server"
> +PACKAGECONFIG[ofono] = "-Dofono_backend=true,-Dofono_backend=false,evolution-data-server"
>   PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib"
>   PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false"
>   PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false"
>   
> -PACKAGECONFIG ??= ""
> +PACKAGECONFIG ??= "telepathy"
>   
>   inherit pkgconfig gnomebase gettext gobject-introspection vala features_check
>   
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95049): https://lists.openembedded.org/g/openembedded-devel/message/95049
> Mute This Topic: https://lists.openembedded.org/mt/88666737/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk Jan. 25, 2022, 5:41 p.m. UTC | #2
but wouldn't it still fail if DISTRO_FEATURE ptest is available until 
python3-dbusmock-native could be built?

Am 25.01.22 um 18:21 schrieb Khem Raj:
> this could also be a packageconfig, which is enabled when ptest is in 
> DISTRO_FEATURE
Khem Raj Jan. 25, 2022, 5:42 p.m. UTC | #3
On Tue, Jan 25, 2022 at 9:41 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> but wouldn't it still fail if DISTRO_FEATURE ptest is available until
> python3-dbusmock-native could be built?

yes. But we will get that in oe-core soon

>
> Am 25.01.22 um 18:21 schrieb Khem Raj:
> > this could also be a packageconfig, which is enabled when ptest is in
> > DISTRO_FEATURE
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#95080): https://lists.openembedded.org/g/openembedded-devel/message/95080
> Mute This Topic: https://lists.openembedded.org/mt/88666737/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb
index 7dc72f822..1144ea8fc 100644
--- a/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb
+++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.4.bb
@@ -7,7 +7,6 @@  DEPENDS = " \
     glib-2.0 \
     libgee \
     libxml2 \
-    python3-dbusmock-native \
 "
 
 GNOMEBASEBUILDCLASS = "meson"
@@ -16,14 +15,16 @@  GNOMEBASEBUILDCLASS = "meson"
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 GIR_MESON_OPTION = ""
 
+EXTRA_OEMESON += "-Dtests=false"
+
 PACKAGECONFIG[eds] = "-Deds_backend=true,-Deds_backend=false,evolution-data-server"
-PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false"
-PACKAGECONFIG[ofono] = "-Dofono_backend=true,-Dofono_backend=false"
+PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-data-server"
+PACKAGECONFIG[ofono] = "-Dofono_backend=true,-Dofono_backend=false,evolution-data-server"
 PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib"
 PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false"
 PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "telepathy"
 
 inherit pkgconfig gnomebase gettext gobject-introspection vala features_check