From 70f7599e595ced918febc6e4730e10ee1fbe0b47 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Apr 2022 18:39:47 +0200 Subject: [PATCH] package/systemd: doesn't build with libressl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit systemd doesn't plan to fix the following build failure with libressl (https://github.com/systemd/systemd/issues/14928) and ED25519 support is still not available in libressl (https://github.com/libressl-portable/portable/issues/393 opened for more than 3 years): ../src/home/homed-manager.c: In function ‘manager_generate_key_pair’: ../src/home/homed-manager.c:1393:35: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? 1393 | ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_ED25519, NULL); | ^~~~~~~~~~~~~~~~ | EVP_PKEY_DSA1 Fixes: - http://autobuild.buildroot.org/results/47f31b36f123c4be4661f4fde2d1f7385c5d0ed5 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 1c79d64ca990da5beeb9682df0dd9e81eae575c4) Signed-off-by: Peter Korsgaard --- package/systemd/Config.in | 2 ++ package/systemd/systemd.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index cc0736561e..00c817172d 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -234,6 +234,7 @@ config BR2_PACKAGE_SYSTEMD_HOMED depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # fscrypt_key select BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_UTIL_LINUX_LIBFDISK help systemd-homed is a system service that may be used to create, @@ -412,6 +413,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED config BR2_PACKAGE_SYSTEMD_REPART bool "enable repart support" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_UTIL_LINUX_LIBFDISK help systemd-repart grows and adds partitions to a partition table, diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 9feed9c084..58a1376b51 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -498,7 +498,7 @@ else SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) SYSTEMD_CONF_OPTS += \ -Dgnutls=false \ -Dopenssl=true \