From b16ae93c85355aad3440737bc4ef7c3ec2d534f3 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sun, 15 Jan 2023 12:48:38 +0100 Subject: [PATCH] package/systemd: support dnssec if openssl is available Set -Ddefault-dnssec=allow-downgrade if openssl is available as both openssl and gcrypt are now supported for dnssec. Move this out of the gcrypt condition into a joint openssl/gcrypt condition. So the dependency and the openssl/gcrypt config is set in the individual openssl and gcrypt conditions, while the default-dnssec option is set in a joint openssl or gcrypt condition. Signed-off-by: Norbert Lange Reviewed-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/systemd/systemd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6536a2740d..cce9162f6d 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -245,9 +245,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_P11_KIT),y) @@ -317,6 +317,12 @@ else SYSTEMD_CONF_OPTS += -Dselinux=false endif +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade +else +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB