diff options
| author | Baeuerle, Florian <Florian.Baeuerle@allegion.com> | 2019-02-26 16:06:24 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-01 12:30:49 +0100 |
| commit | da357e314432f6d472dd914a7c291c9d6d46eac5 (patch) | |
| tree | 20717e1bea4962407bf3be57b906a46ae5c40358 | |
| parent | 74178b5179345e1ba6d5a25a0ea6219742d600d3 (diff) | |
| download | ptxdist-da357e314432f6d472dd914a7c291c9d6d46eac5.tar.gz ptxdist-da357e314432f6d472dd914a7c291c9d6d46eac5.tar.xz | |
networkmanager: configure with polkit if POLKIT is enabled
Also install NetworkManagers polkit policy-files when POLKIT is enabled.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/networkmanager.in | 4 | ||||
| -rw-r--r-- | rules/networkmanager.make | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 70a013940..26e9fff9d 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -89,6 +89,10 @@ config NETWORKMANAGER_EXAMPLES bool prompt "install examples for Network Manager" +config NETWORKMANAGER_POLKIT + bool + default POLKIT + endif menu "networkmanager plugins " diff --git a/rules/networkmanager.make b/rules/networkmanager.make index fbbd90e67..6d31a201a 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -50,7 +50,7 @@ NETWORKMANAGER_CONF_OPT = \ --disable-qt \ --disable-teamdctl \ --disable-json-validation \ - --disable-polkit \ + --$(call ptx/endis,PTXCONF_NETWORKMANAGER_POLKIT)-polkit \ --disable-polkit-agent \ --disable-modify-system \ --$(call ptx/endis,PTXCONF_NETWORKMANAGER_PPP)-ppp \ @@ -225,6 +225,10 @@ endif @$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system.d/) @$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system-services/) +ifdef PTXCONF_NETWORKMANAGER_POLKIT + @$(call install_tree, networkmanager, 0, 0, -, /usr/share/polkit-1/actions) +endif + ifdef PTXCONF_NETWORKMANAGER_EXAMPLES @$(call install_glob, networkmanager, 0, 0, -, /usr/bin, */nm-*-*) endif |