From 0f42b815323b4d4731bd508550e2b0bcc019a8ce Mon Sep 17 00:00:00 2001 From: John Keeping Date: Fri, 27 May 2022 12:36:58 +0100 Subject: [PATCH] package/network-manager: support libnss instead of gnutls NetworkManager supports compiling against either NSS or GnuTLS and in fact upstream defaults to NSS if both are available and no choice is specified. Providing a choice can shrink images slightly if some other package is already pulling in NSS but GnuTLS is not otherwise required. Since a crypto provider is required and to maintain backwards compatibility, select GnuTLS when NSS is not selected. In keeping with the upstream default, choose NSS when both libraries are available. Signed-off-by: John Keeping [Peter: rework to the meson equivalent] Signed-off-by: Peter Korsgaard --- package/network-manager/Config.in | 2 +- package/network-manager/network-manager.mk | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 1f56daa187..37c4a79d16 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_NETWORK_MANAGER depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DBUS - select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_GNUTLS if !BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNDP select BR2_PACKAGE_UTIL_LINUX diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 105273a74c..a17c5e1774 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -20,7 +20,6 @@ NETWORK_MANAGER_DEPENDENCIES = \ host-libxslt \ host-pkgconf \ dbus \ - gnutls \ libglib2 \ libndp \ udev \ @@ -31,7 +30,6 @@ NETWORK_MANAGER_CONF_OPTS = \ -Ddocs=false \ -Dtests=no \ -Dqt=false \ - -Dcrypto=gnutls \ -Diptables=/usr/sbin/iptables \ -Difupdown=false \ -Dnm_cloud_setup=false \ @@ -73,6 +71,14 @@ else NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false endif +ifeq ($(BR2_PACKAGE_LIBNSS),y) +NETWORK_MANAGER_DEPENDENCIES += libnss +NETWORK_MANAGER_CONF_OPTS += -Dcrypto=nss +else +NETWORK_MANAGER_DEPENDENCIES += gnutls +NETWORK_MANAGER_CONF_OPTS += -Dcrypto=gnutls +endif + ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true