Re: [Qemu-devel] [PATCH] configure: copy MacOS NDRV driver into sharedir for out-of-tree builds

[Mark Cave-Ayland]

On 10/05/2019 17:49, Peter Maydell wrote:

> On Fri, 10 May 2019 at 17:37, Mark Cave-Ayland
> <address@hidden> wrote:
>>
>> Make sure that we include *.ndrv files with those being copied to sharedir
>> during out-of-tree builds. This ensures that the MacOS driver is correctly
>> located and loaded by qemu-system-ppc.
>>
>> Signed-off-by: Mark Cave-Ayland <address@hidden>
>> ---
>>  configure | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/configure b/configure
>> index 63f312bd1f..9493537301 100755
>> --- a/configure
>> +++ b/configure
>> @@ -7886,6 +7886,7 @@ for bios_file in \
>>      $source_path/pc-bios/*.dtb \
>>      $source_path/pc-bios/*.img \
>>      $source_path/pc-bios/openbios-* \
>> +    $source_path/pc-bios/*.ndrv \
>>      $source_path/pc-bios/u-boot.* \
>>      $source_path/pc-bios/edk2-*.fd.bz2 \
>>      $source_path/pc-bios/palcode-*
> 
> The comment above this bit of code says:
> 
> # Caution: do not add files or directories here using wildcards. This
> # will result in problems later if a new file matching the wildcard is
> # added to the source tree -- nothing will cause configure to be rerun
> # so the build tree will be missing the link back to the new file, and
> # tests might fail.
> 
> The pc-bios/ directory is awkward legacy which we
> can't really apply the next part of the comment to
> ("Prefer to keep the relevant files in their own
> directory and symlink the directory instead"), but since
> there is only one *.ndrv file we can at least avoid the
> wildcard by writing "qemu_vga.ndrv" instead of "*.ndrv".

I did spot that, but figured that it was outdated because no-one else was really
following it. The reason for adding the explicit wildcard is that the driver 
build
produces 2 separate .ndrv files - debug, and non-debug - and so it saves me a 
bit of
effort after a rebase and rebuild.

Should we say up front as part of the conversion to o-o-t builds that all files 
must
be explicitly listed in that section as per the comment? Or should each type of
driver live in its own subdirectory?


ATB,

Mark.