From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] v2 networkmanager: enable ppp support
Date: Wed, 21 Oct 2015 21:02:10 +0200 [thread overview]
Message-ID: <20151021190210.GA1298@localhost.localdomain> (raw)
In-Reply-To: <20151021130626.GA22280@localhost.localdomain>
Changes since v1:
- Select also PPP_PLUGINS otherwise plugin option is unknown to pppd
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index b4af2b2..90c2680 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -19,6 +19,8 @@ menuconfig NETWORKMANAGER
select UDEV if RUNTIME
select LIBGUDEV
select MODEMMANAGER if NETWORKMANAGER_WWAN
+ select PPP if NETWORKMANAGER_PPP
+ select PPP_PLUGINS if NETWORKMANAGER_PPP
select WPA_SUPPLICANT if NETWORKMANAGER_WIRELESS && RUNTIME
select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && RUNTIME
select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && RUNTIME
@@ -64,6 +66,10 @@ config NETWORKMANAGER_WWAN
bool
prompt "enable WWAN support"
+config NETWORKMANAGER_PPP
+ bool
+ prompt "enable ppp support"
+
config NETWORKMANAGER_EXAMPLES
bool
prompt "install examples for Network Manager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 842c4e2..e77770d 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -47,7 +47,7 @@ NETWORKMANAGER_CONF_OPT := \
--disable-wimax \
--disable-polkit \
--disable-modify-system \
- --disable-ppp \
+ --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \
--disable-bluez5-dun \
--disable-concheck \
--enable-more-warnings \
@@ -76,6 +76,10 @@ NETWORKMANAGER_CONF_OPT := \
--without-valgrind \
--without-tests
+ifdef PTXCONF_NETWORKMANAGER_PPP
+NETWORKMANAGER_CONF_OPT += \
+ --with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH)
+endif
ifdef PTXCONF_NETWORKMANAGER_WWAN
NETWORKMANAGER_LDFLAGS := \
@@ -180,6 +184,9 @@ 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
+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)
--
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2015-10-21 19:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-21 13:06 [ptxdist] [PATCH] " Ladislav Michl
2015-10-21 19:02 ` Ladislav Michl [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151021190210.GA1298@localhost.localdomain \
--to=ladis@linux-mips.org \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox