summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian <adrian.freihofer@gmail.com>2021-01-26 23:38:56 +0100
committerKhem Raj <raj.khem@gmail.com>2021-01-27 10:21:12 -0800
commit43077d8321a95fcfcdb3571fc916131473b875e7 (patch)
tree45ec51f8f2363d00c61d6e60e4b78ee07a24ced5
parent62ab2ad252372508d4e18acaf4194033b0c38b19 (diff)
downloadmeta-openembedded-43077d8321a95fcfcdb3571fc916131473b875e7.tar.gz
networkmanager: add missing readline depends
Introduce PACKAGECONFIG[nmcli] to make building the nmcli utility which depends on GPLv3 licensed readline library optional. Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
index 3e7a068acb..dcb23d05c4 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.28.0.bb
@@ -19,7 +19,7 @@ DEPENDS = " \
19 curl \ 19 curl \
20" 20"
21 21
22inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even 22inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even
23 23
24SRC_URI = " \ 24SRC_URI = " \
25 ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ 25 ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
@@ -62,11 +62,14 @@ do_compile_prepend() {
62 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"
63} 63}
64 64
65PACKAGECONFIG ??= "nss ifupdown dnsmasq \ 65PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \
66 ${@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)} \
67 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ 67 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
68 ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ 68 ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \
69" 69"
70
71inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)}
72
70PACKAGECONFIG[systemd] = " \ 73PACKAGECONFIG[systemd] = " \
71 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ 74 --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
72 --without-systemdsystemunitdir, \ 75 --without-systemdsystemunitdir, \
@@ -85,6 +88,7 @@ PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable
85PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" 88PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
86PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" 89PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
87PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" 90PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no"
91PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline"
88 92
89PACKAGES =+ " \ 93PACKAGES =+ " \
90 ${PN}-nmcli ${PN}-nmcli-doc \ 94 ${PN}-nmcli ${PN}-nmcli-doc \