From 61fffbfa580bb7452f5930ddc26d8e89ea302661 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 8 Nov 2025 07:01:11 +0900 Subject: [PATCH] meson: sysupdate requires systemd-pull and friends Fixes #39635. --- meson.build | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 6c4b67d28d3..b5628a2a609 100644 --- a/meson.build +++ b/meson.build @@ -1534,10 +1534,19 @@ conf.set('DEFAULT_DNSSEC_MODE', 'DNSSEC_' + default_dnssec.underscorify().to_upper()) conf.set_quoted('DEFAULT_DNSSEC_MODE_STR', default_dnssec) +have = get_option('importd').require( + conf.get('HAVE_LIBCURL') == 1 and + conf.get('HAVE_OPENSSL') == 1 and + conf.get('HAVE_ZLIB') == 1 and + conf.get('HAVE_XZ') == 1, + error_message : 'curl, openssl/grypt, zlib and xz required').allowed() +conf.set10('ENABLE_IMPORTD', have) + have = get_option('sysupdate').require( + conf.get('ENABLE_IMPORTD') == 1 and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_LIBFDISK') == 1, - error_message : 'fdisk and openssl required').allowed() + error_message : 'systemd-importd, fdisk, and openssl required').allowed() conf.set10('ENABLE_SYSUPDATE', have) have2 = get_option('sysupdated') @@ -1556,14 +1565,6 @@ conf.set10('ENABLE_SYSUPDATED', have2) conf.set10('ENABLE_STORAGETM', get_option('storagetm')) -have = get_option('importd').require( - conf.get('HAVE_LIBCURL') == 1 and - conf.get('HAVE_OPENSSL') == 1 and - conf.get('HAVE_ZLIB') == 1 and - conf.get('HAVE_XZ') == 1, - error_message : 'curl, openssl/grypt, zlib and xz required').allowed() -conf.set10('ENABLE_IMPORTD', have) - have = get_option('homed').require( conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_LIBFDISK') == 1 and -- 2.47.3