diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2016-06-09 17:29:06 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-13 10:06:47 +0200 |
| commit | 1790321194120f53b9f4c5daf32e271a6cc4e64c (patch) | |
| tree | 77f793a624d9c3e7ecd6664426cff0cbd5913dc9 /rules | |
| parent | bae1e18c567f8a9e707b3140ccec453762ad8fd9 (diff) | |
| download | ptxdist-1790321194120f53b9f4c5daf32e271a6cc4e64c.tar.gz ptxdist-1790321194120f53b9f4c5daf32e271a6cc4e64c.tar.xz | |
networkmanager: fix libnm handling
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 <ladis@linux-mips.org>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/networkmanager.make | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rules/networkmanager.make b/rules/networkmanager.make index e2af34bb8..3e4d2ac04 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/) |