From: Emil Velikov Date: Mon, 1 Jun 2026 14:45:40 +0000 (+0100) Subject: meson: use arrays to manage module compressions/signatures X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f88f604e34c7c6d58f3ad26deafa9f3624423804;p=thirdparty%2Fkmod.git meson: use arrays to manage module compressions/signatures Signed-off-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/426 Signed-off-by: Lucas De Marchi --- diff --git a/meson.build b/meson.build index d702a98c..9fdf7634 100644 --- a/meson.build +++ b/meson.build @@ -148,8 +148,8 @@ endif # Options ################################################################################ -module_compressions = '' -module_signatures = '' +compressions = [] +signatures = [] features = [] dep_map = {} @@ -295,16 +295,23 @@ foreach tuple : _moar_deps cdata.set10('ENABLE_' + opt.to_upper(), have) cdata.set10('ENABLE_' + opt.to_upper() + '_DLOPEN', have and dlopen) - if opt == 'openssl' - module_signatures = have ? 'PKCS7 legacy' : 'legacy' - elif have - module_compressions += f'@opt@ ' + if have + if opt == 'openssl' + signatures += ['PKCS7'] + else + compressions += [f'@opt@'] + endif endif features += ['@0@@1@'.format(have ? '+' : '-', opt.to_upper())] dep_map += {opt : dep} endforeach +signatures += ['legacy'] + +module_compressions = ' '.join(compressions) +module_signatures = ' '.join(signatures) + #------------------------------------------------------------------------------- # Config output #-------------------------------------------------------------------------------