Re: [RFC PATCH] configure: allow the overriding of default-config in the build

[Paolo Bonzini]

On 28/05/21 18:31, Alex Bennée wrote:
> +  --with-devices-*[!a-zA-Z0-9_-]*=*) error_exit "Passed bad --with-devices-cc-FOO 
> option"

Extra "cc".

Looks pretty good otherwise, possible tweaks include:

1) check that the architecture exists (i.e. that it there is a valid 
softmmu target named after it)

2) checking that the file exists using "test -f".

> diff --git a/configs/aarch64-softmmu/aarch64-softmmu-64bit-only.mak 
> b/configs/aarch64-softmmu/aarch64-softmmu-64bit-only.mak

Not sure if you want to include this file or it's just an example; if 
you do, you probably should either remove the directory or call it 
64bit-only.mak, without including aarch64-softmmu twice.

Paolo

> index 0000000000..3626de9e3c
> --- /dev/null
> +++ b/configs/aarch64-softmmu/aarch64-softmmu-64bit-only.mak
> @@ -0,0 +1,10 @@
> +#
> +# A version of the config that only supports 64bits and their devices.
> +# This doesn't quite eliminate all 32 bit devices as some boards like
> +# "virt" support both.
> +#
> +
> +CONFIG_ARM_VIRT=y
> +CONFIG_XLNX_ZYNQMP_ARM=y
> +CONFIG_XLNX_VERSAL=y
> +CONFIG_SBSA_REF=y
> diff --git a/meson.build b/meson.build
> index 3f065f53f2..656ebde513 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1350,9 +1350,10 @@ foreach target : target_dirs
>                                                  configuration: 
> config_target_data)}
>   
>     if target.endswith('-softmmu')
> +    config_input = meson.get_external_property(target, 
> 'default-configs/devices' / target + '.mak')
>       config_devices_mak = target + '-config-devices.mak'
>       config_devices_mak = configure_file(
> -      input: ['default-configs/devices' / target + '.mak', 'Kconfig'],
> +      input: [config_input, 'Kconfig'],
>         output: config_devices_mak,
>         depfile: config_devices_mak + '.d',
>         capture: true,