From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 20 Jun 2022 08:25:16 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o3AqZ-007oPt-2O for lore@lore.pengutronix.de; Mon, 20 Jun 2022 08:25:16 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o3AqY-0001tn-56; Mon, 20 Jun 2022 08:25:14 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o3Ala-0004gy-G3; Mon, 20 Jun 2022 08:20:06 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1o3AlY-001ahj-DE; Mon, 20 Jun 2022 08:20:05 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1o3AlZ-006GYL-4V; Mon, 20 Jun 2022 08:20:05 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 20 Jun 2022 08:20:05 +0200 Message-Id: <20220620062005.1493553-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220617121915.3660205-1-ejo@pengutronix.de> References: <20220617121915.3660205-1-ejo@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] networkmanager: add option for introspection support X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Enrico Jorns Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 43ce347c006473c048e0e3add36664eef886e31d. Michael [sent from post-receive hook] On Mon, 20 Jun 2022 08:20:04 +0200, Enrico Jorns 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 > Message-Id: <20220617121915.3660205-1-ejo@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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)