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

package/usbguard: needs at least a crypto backend

Browse Source 
Since its addition in commit fbff7d7289,
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 <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2021-08-04 12:07:36 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 08d1536202
commit 63ecfad96a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/usbguard/Config.in
View File

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

14
package/usbguard/usbguard.mk
View File

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