diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-02-26 15:31:57 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-03-04 17:01:36 +0100 |
| commit | 848b7320c614343b624ab6e08fcebad91c171e22 (patch) | |
| tree | d8ac76f8e526a4fe97c88d2af5764b8683644ac1 | |
| parent | c56d6c9853d73c86da002b04c698a10b6ddc7534 (diff) | |
| download | ptxdist-848b7320c614343b624ab6e08fcebad91c171e22.tar.gz ptxdist-848b7320c614343b624ab6e08fcebad91c171e22.tar.xz | |
networkmanager: add option for WWAN support
The rpath is needed so that libnm-wwan.so is found by
libnm-device-plugin-wwan.so.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/networkmanager.in | 5 | ||||
| -rw-r--r-- | rules/networkmanager.make | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/rules/networkmanager.in b/rules/networkmanager.in index eed0aa66f..07f11cb72 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -20,6 +20,7 @@ menuconfig NETWORKMANAGER select LIBNDP select UDEV if RUNTIME select UDEV_LIBGUDEV + select MODEMMANAGER if NETWORKMANAGER_WWAN select WPA_SUPPLICANT if NETWORKMANAGER_WIRELESS && RUNTIME select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && RUNTIME select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && RUNTIME @@ -61,6 +62,10 @@ config NETWORKMANAGER_WIRELESS bool prompt "enable wireless support" +config NETWORKMANAGER_WWAN + bool + prompt "enable WWAN support" + config NETWORKMANAGER_EXAMPLES bool prompt "install examples for Network Manager" diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 677460e42..46efa8233 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -62,7 +62,7 @@ NETWORKMANAGER_CONF_OPT := \ --with-suspend-resume=systemd \ --with-crypto=gnutls \ --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --without-modem-manager-1 \ + --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WWAN)-modem-manager-1 \ --with-dhclient=/sbin/dhclient \ --without-dhcpcd \ --without-resolvconf \ @@ -76,6 +76,12 @@ NETWORKMANAGER_CONF_OPT := \ --without-valgrind \ --without-tests + +ifdef PTXCONF_NETWORKMANAGER_WWAN +NETWORKMANAGER_LDFLAGS := \ + -Wl,-rpath,/usr/lib/NetworkManager +endif + # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- @@ -168,6 +174,10 @@ endif ifdef PTXCONF_NETWORKMANAGER_WIRELESS @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wifi) endif +ifdef PTXCONF_NETWORKMANAGER_WWAN + @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-device-plugin-wwan) + @$(call install_lib, networkmanager, 0, 0, 0644, NetworkManager/libnm-wwan) +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) |