NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/network-manager: support libnss instead of gnutls

Browse Source 
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 <john@metanate.com>
[Peter: rework to the meson equivalent]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
John Keeping 2022-05-27 12:36:58 +01:00 committed by Peter Korsgaard
parent d7561a8c5e
commit 0f42b81532
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network-manager/Config.in
View File

@ -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

10
package/network-manager/network-manager.mk
View File

@ -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