diff options
-rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb index ac2282ea1b..2613076a7e 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.22.14.bb | |||
@@ -45,6 +45,10 @@ EXTRA_OECONF = " \ | |||
45 | --with-tests \ | 45 | --with-tests \ |
46 | --with-nmtui=yes \ | 46 | --with-nmtui=yes \ |
47 | --with-udev-dir=${nonarch_base_libdir}/udev \ | 47 | --with-udev-dir=${nonarch_base_libdir}/udev \ |
48 | --with-dhclient=no \ | ||
49 | --with-dhcpcd=no \ | ||
50 | --with-dhcpcanon=no \ | ||
51 | --with-netconfig=no \ | ||
48 | " | 52 | " |
49 | 53 | ||
50 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template | 54 | # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template |
@@ -58,7 +62,7 @@ do_compile_prepend() { | |||
58 | export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" | 62 | export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" |
59 | } | 63 | } |
60 | 64 | ||
61 | PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \ | 65 | PACKAGECONFIG ??= "nss ifupdown dnsmasq \ |
62 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ | 66 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ |
63 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ | 67 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ |
64 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ | 68 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ |
@@ -73,8 +77,6 @@ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" | |||
73 | PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" | 77 | PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" |
74 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" | 78 | PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" |
75 | PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" | 79 | PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" |
76 | # Use full featured dhcp client instead of internal one | ||
77 | PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcpcd" | ||
78 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" | 80 | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" |
79 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" | 81 | PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" |
80 | PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" | 82 | PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf" |