On Thu, Jun 09, 2016 at 05:29:06PM +0200, Robert Schwebel wrote: > Since NewtworkManager 1.0, libnm is the new API and replaces libnm-util > and libnm-glib; these files are still there, but officially declared to > be deprecated. > > This fix also avoids a dependency on DBUS_GLIB, which is also deprecated > for quite some time now and replaced by GDBUS. > > Inspired-by: Ladislav Michl <[email protected]> > Signed-off-by: Robert Schwebel <[email protected]> > ---
Thanks, applied. Michael > rules/networkmanager.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Changes since (implicit) v1: > > * don't add dependency to DBUS_GLIB > * switch to new integrated libnm API library, as suggested by Ladislav Michl > > diff --git a/rules/networkmanager.make b/rules/networkmanager.make > index e2af34bb..7decc6b 100644 > --- a/rules/networkmanager.make > +++ b/rules/networkmanager.make > @@ -62,7 +62,7 @@ NETWORKMANAGER_CONF_OPT := \ > --disable-gtk-doc-html \ > --disable-gtk-doc-pdf \ > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \ > - --with-libnm-glib \ > + --without-libnm-glib \ > --with-systemdsystemunitdir=/lib/systemd/system \ > --with-hostname-persist=default \ > --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \ > @@ -205,9 +205,6 @@ ifdef PTXCONF_NETWORKMANAGER_PPP > @$(call install_copy, networkmanager, 0, 0, 0644, -, > $(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so) > endif > @$(call install_lib, networkmanager, 0, 0, 0644, libnm) > - @$(call install_lib, networkmanager, 0, 0, 0644, libnm-util) > - @$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib) > - @$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib-vpn) > > @$(call install_tree, networkmanager, 0, 0, -, > /usr/share/dbus-1/system.d/) > @$(call install_tree, networkmanager, 0, 0, -, > /usr/share/dbus-1/system-services/) > -- > 2.8.1 > > _______________________________________________ > ptxdist mailing list > [email protected] -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected]
