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

package/hiawatha: disable system mbedtls

Browse Source 
hiawatha needs mbedtls3 since bump to version 11.1 in commit
24e4c888c3:

/home/giuliobenetti/autobuild/run/instance-3/output-1/build/hiawatha-11.1/src/wigwam.c:39:10: fatal error: mbedtls/psa_util.h: No such file or directory
   39 | #include "mbedtls/psa_util.h"
      |          ^~~~~~~~~~~~~~~~~~~~

As mbedtls 3.x is not backward compatible with mbedtls 2.x, disable
system mbedtls to let hiawatha uses its own copy (which will be
installed in $(TARGET_DIR)/usr/lib/hiawatha)

Fixes:
 - http://autobuild.buildroot.org/results/064af90aa95c28781d96d7eca0f14841fce0687a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2022-01-09 14:39:39 +01:00 committed by Peter Korsgaard
parent c669bd5115
commit 4e36e8f208
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/hiawatha/Config.in
View File

@ -32,6 +32,5 @@ if BR2_PACKAGE_HIAWATHA
config BR2_PACKAGE_HIAWATHA_SSL
bool "hiawatha TLS support"
select BR2_PACKAGE_MBEDTLS
endif

7
package/hiawatha/hiawatha.mk
View File

@ -20,8 +20,11 @@ HIAWATHA_CONF_OPTS = \
-DWORK_DIR=/var/lib/hiawatha
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON
HIAWATHA_DEPENDENCIES += mbedtls
# Disable system mbedtls as hiawatha needs mbedtls 3.x
HIAWATHA_CONF_OPTS += \
-DENABLE_TLS=ON \
-DINSTALL_MBEDTLS_HEADERS=OFF \
-DUSE_SYSTEM_MBEDTLS=OFF
else
HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF
endif