[ptxdist] [PATCH] networkmanager: add option for introspection support

[ptxdist] [PATCH] networkmanager: add option for introspection support

[Enrico Jorns]

This allows to enable networkmanager gobject introspection support (or
automatically enables it if introspection support is already enabled in
BSP).

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/networkmanager.in   | 6 ++++++
 rules/networkmanager.make | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index dae60a0c8..5d9be26f0 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -3,6 +3,7 @@
 menuconfig NETWORKMANAGER
 	tristate
 	# intltool is unconditionally requested by configure
+	select GOBJECT_INTROSPECTION            if NETWORKMANAGER_INTROSPECTION
 	select HOST_GLIB
 	select HOST_INTLTOOL
 	select HOST_LIBXSLT
@@ -110,6 +111,11 @@ config NETWORKMANAGER_MORE_LOGGING
 	help
 	  Allows debug log level in NetworkManager.conf
 
+config NETWORKMANAGER_INTROSPECTION
+       bool
+       prompt "introspection support"
+       default GOBJECT_INTROSPECTION_HELPER
+
 endif
 
 menu "networkmanager plugins        "
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 022ed7178..9b47fadad 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -54,7 +54,7 @@ NETWORKMANAGER_CONF_OPT = \
 	-Dhostname_persist=default \
 	-Difcfg_rh=false \
 	-Difupdown=true \
-	-Dintrospection=false \
+	-Dintrospection=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_INTROSPECTION) \
 	-Diptables=/usr/sbin/iptables \
 	-Diwd=false \
 	-Dkernel_firmware_dir=/lib/firmware \
@@ -214,6 +214,10 @@ ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
 	@$(call install_glob, networkmanager, 0, 0, -, /usr/bin, */nm-*-*)
 endif
 
+ifdef PTXCONF_NETWORKMANAGER_INTROSPECTION
+	@$(call install_tree, networkmanager, 0, 0, -, /usr/lib/girepository-1.0)
+endif
+
 	@$(call install_finish, networkmanager)
 
 	@$(call touch)
-- 
2.30.2

Re: [ptxdist] [APPLIED] networkmanager: add option for introspection support

[Michael Olbrich]

Thanks, applied as 43ce347c006473c048e0e3add36664eef886e31d.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:20:04 +0200, Enrico Jorns <ejo@pengutronix.de> wrote:
> This allows to enable networkmanager gobject introspection support (or
> automatically enables it if introspection support is already enabled in
> BSP).
> 
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> Message-Id: <20220617121915.3660205-1-ejo@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/networkmanager.in b/rules/networkmanager.in
> index dae60a0c8d42..5d9be26f00e3 100644
> --- a/rules/networkmanager.in
> +++ b/rules/networkmanager.in
> @@ -3,6 +3,7 @@
>  menuconfig NETWORKMANAGER
>  	tristate
>  	# intltool is unconditionally requested by configure
> +	select GOBJECT_INTROSPECTION            if NETWORKMANAGER_INTROSPECTION
>  	select HOST_GLIB
>  	select HOST_INTLTOOL
>  	select HOST_LIBXSLT
> @@ -110,6 +111,11 @@ config NETWORKMANAGER_MORE_LOGGING
>  	help
>  	  Allows debug log level in NetworkManager.conf
>  
> +config NETWORKMANAGER_INTROSPECTION
> +       bool
> +       prompt "introspection support"
> +       default GOBJECT_INTROSPECTION_HELPER
> +
>  endif
>  
>  menu "networkmanager plugins        "
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index 022ed7178997..9b47fadad176 100644
> --- a/rules/networkmanager.make
> +++ b/rules/networkmanager.make
> @@ -54,7 +54,7 @@ NETWORKMANAGER_CONF_OPT = \
>  	-Dhostname_persist=default \
>  	-Difcfg_rh=false \
>  	-Difupdown=true \
> -	-Dintrospection=false \
> +	-Dintrospection=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_INTROSPECTION) \
>  	-Diptables=/usr/sbin/iptables \
>  	-Diwd=false \
>  	-Dkernel_firmware_dir=/lib/firmware \
> @@ -214,6 +214,10 @@ ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
>  	@$(call install_glob, networkmanager, 0, 0, -, /usr/bin, */nm-*-*)
>  endif
>  
> +ifdef PTXCONF_NETWORKMANAGER_INTROSPECTION
> +	@$(call install_tree, networkmanager, 0, 0, -, /usr/lib/girepository-1.0)
> +endif
> +
>  	@$(call install_finish, networkmanager)
>  
>  	@$(call touch)