Wire up uefi-vars in the build system.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/meson.build      |  1 +
 hw/uefi/meson.build | 19 +++++++++++++++++++
 meson.build         |  1 +
 3 files changed, 21 insertions(+)

diff --git a/hw/meson.build b/hw/meson.build
index b827c82c5d7b..138f5d59e178 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -35,6 +35,7 @@ subdir('smbios')
 subdir('ssi')
 subdir('timer')
 subdir('tpm')
+subdir('uefi')
 subdir('ufs')
 subdir('usb')
 subdir('vfio')
diff --git a/hw/uefi/meson.build b/hw/uefi/meson.build
index a8b168941255..e63708aa164f 100644
--- a/hw/uefi/meson.build
+++ b/hw/uefi/meson.build
@@ -1 +1,20 @@
 system_ss.add(files('hardware-info.c'))
+
+uefi_vars_ss = ss.source_set()
+if (config_all_devices.has_key('CONFIG_UEFI_VARS'))
+  uefi_vars_ss.add(files('var-service-core.c',
+                         'var-service-json.c',
+                         'var-service-vars.c',
+                         'var-service-auth.c',
+                         'var-service-guid.c',
+                         'var-service-utils.c',
+                         'var-service-policy.c'))
+  uefi_vars_ss.add(when: gnutls,
+                   if_true: files('var-service-pkcs7.c'),
+                   if_false: files('var-service-pkcs7-stub.c'))
+  uefi_vars_ss.add(files('var-service-siglist.c'))
+endif
+
+modules += { 'hw-uefi' : {
+    'vars'     : uefi_vars_ss,
+}}
diff --git a/meson.build b/meson.build
index 0ee79c664d39..3f998249d97e 100644
--- a/meson.build
+++ b/meson.build
@@ -3596,6 +3596,7 @@ if have_system
     'hw/ssi',
     'hw/timer',
     'hw/tpm',
+    'hw/uefi',
     'hw/ufs',
     'hw/usb',
     'hw/vfio',
-- 
2.48.1

25.02.2025 19:30, Gerd Hoffmann wrote:
> Wire up uefi-vars in the build system.

> diff --git a/hw/uefi/meson.build b/hw/uefi/meson.build
> index a8b168941255..e63708aa164f 100644
> --- a/hw/uefi/meson.build
> +++ b/hw/uefi/meson.build
> @@ -1 +1,20 @@
>   system_ss.add(files('hardware-info.c'))
> +
> +uefi_vars_ss = ss.source_set()
> +if (config_all_devices.has_key('CONFIG_UEFI_VARS'))
> +  uefi_vars_ss.add(files('var-service-core.c',

CONFIG_UEFI_VARS is in hw/uefi/Kconfig, defined as:

config UEFI_VARS
         bool
         default y if X86_64 || AARCH64

Shouldn't this module not build on i386 or any other
32bit host, where we don't build 64bit targets?

Right now (10.0.0-rc0), hw-uefi-vars.so is built on i386 or
armel, where apparently it shouldn't.

Why X86_64 || AARCH64 is true on i386?  Shouldn't it be false after
acce728cbc6c154b "meson: Disallow 64-bit on 32-bit emulation" ?

Thanks,

/mjt