From 63ecfad96ad653e445d57632c81f5f27fa1761ca Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 4 Aug 2021 12:07:36 +0200 Subject: [PATCH] package/usbguard: needs at least a crypto backend Since its addition in commit fbff7d7289cc95db991184f890f4ca1fcf8a101e, usbguard needs a crypto backend otherwise the build will fail on: checking for sodium... no checking for libcrypto... no checking for powerpc-buildroot-linux-uclibc-libgcrypt-config... no checking for libgcrypt-config... no checking for LIBGCRYPT - version >= 1.5.0... no configure: error: The selected crypto backend library is not available. So select sodium as the default crypto backend as this is the default choice in configure.ac. Fixes: - http://autobuild.buildroot.org/results/fb9865e2c65ea1dd9a657e1181a6c8c49481fda7 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/usbguard/Config.in | 1 + package/usbguard/usbguard.mk | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index 58ee5c4b25..41f19dc1a0 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_USBGUARD depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB + select BR2_PACKAGE_LIBSODIUM if !BR2_PACKAGE_LIBGCRYPT && !BR2_PACKAGE_LIBOPENSSL help The USBGuard software framework diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index 1518f92fc5..a0d1c8446f 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -18,23 +18,19 @@ USBGUARD_CONF_OPTS = \ USBGUARD_DEPENDENCIES += libqb protobuf -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBSODIUM),y) +USBGUARD_CONF_OPTS += --with-crypto-library=sodium +USBGUARD_DEPENDENCIES += libsodium +else ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) USBGUARD_CONF_OPTS += --with-crypto-library=openssl USBGUARD_DEPENDENCIES += libopenssl -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) USBGUARD_CONF_ENV += \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config USBGUARD_CONF_OPTS += --with-crypto-library=gcrypt USBGUARD_DEPENDENCIES += libgcrypt endif -ifeq ($(BR2_PACKAGE_LIBSODIUM),y) -USBGUARD_CONF_OPTS += --with-crypto-library=sodium -USBGUARD_DEPENDENCIES += libsodium -endif - ifeq ($(BR2_PACKAGE_SYSTEMD),y) USBGUARD_CONF_OPTS += --enable-systemd USBGUARD_DEPENDENCIES += systemd -- 2.30.2