mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-09 16:19:59 +00:00
Code Issues Projects Releases Wiki Activity

networkmanager: introduce polkit package config

Browse Source 
Currently polkit is enabled if systemd is in package config. Those
two things are orthogonal: NetworkManager can be used with systemd
and without polkit just fine.

Introduce a new polkit package config and enable it depending on
whether polkit is in DISTRO_FEATURES.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Stefan Agner
2019-01-17 17:26:26 +01:00
committed by Khem Raj
parent 97a1a55f47
commit e6836ceaef
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
+3 -4
View File
@@ -16,7 +16,6 @@ DEPENDS = " \
util-linux \ util-linux \
libndp \ libndp \
libnewt \ libnewt \
polkit \
jansson \ jansson \
curl \ curl \
" "
@@ -69,13 +68,13 @@ do_compile_prepend() {
PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \
" "
PACKAGECONFIG[systemd] = " \ PACKAGECONFIG[systemd] = " \
--with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
--without-systemdsystemunitdir, \ --without-systemdsystemunitdir, \
polkit \
" "
PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit"
PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
# consolekit is not picked by shlibs, so add it to RDEPENDS too # consolekit is not picked by shlibs, so add it to RDEPENDS too
PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"