diff options
-rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb index 870a528147..f1826c68e1 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb | |||
@@ -16,7 +16,6 @@ DEPENDS = " \ | |||
16 | util-linux \ | 16 | util-linux \ |
17 | libndp \ | 17 | libndp \ |
18 | libnewt \ | 18 | libnewt \ |
19 | polkit \ | ||
20 | jansson \ | 19 | jansson \ |
21 | curl \ | 20 | curl \ |
22 | " | 21 | " |
@@ -69,13 +68,13 @@ do_compile_prepend() { | |||
69 | PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ | 68 | PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ |
70 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ | 69 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ |
71 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 70 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
72 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ | 71 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ |
73 | " | 72 | " |
74 | PACKAGECONFIG[systemd] = " \ | 73 | PACKAGECONFIG[systemd] = " \ |
75 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ | 74 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ |
76 | --without-systemdsystemunitdir, \ | 75 | --without-systemdsystemunitdir, \ |
77 | polkit \ | ||
78 | " | 76 | " |
77 | PACKAGECONFIG[polkit] = "--enable-polkit --enable-polkit-agent,--disable-polkit --disable-polkit-agent,polkit" | ||
79 | PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" | 78 | PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" |
80 | # consolekit is not picked by shlibs, so add it to RDEPENDS too | 79 | # consolekit is not picked by shlibs, so add it to RDEPENDS too |
81 | PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" | 80 | PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" |