From 43077d8321a95fcfcdb3571fc916131473b875e7 Mon Sep 17 00:00:00 2001 From: Adrian Date: Tue, 26 Jan 2021 23:38:56 +0100 Subject: 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 Signed-off-by: Khem Raj --- .../recipes-connectivity/networkmanager/networkmanager_1.28.0.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta-networking') 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 = " \ curl \ " -inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even +inherit gnomebase gettext update-rc.d systemd vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ @@ -62,11 +62,14 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" } -PACKAGECONFIG ??= "nss ifupdown dnsmasq \ +PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \ " + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} + PACKAGECONFIG[systemd] = " \ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \ --without-systemdsystemunitdir, \ @@ -85,6 +88,7 @@ PACKAGECONFIG[wifi] = "--with-wext=yes --enable-wifi=yes,--with-wext=no --enable PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no" +PACKAGECONFIG[nmcli] = "--with-nmcli=yes,--with-nmcli=no,readline" PACKAGES =+ " \ ${PN}-nmcli ${PN}-nmcli-doc \ -- cgit v1.2.3-54-g00ecf