[PATCH] build: Add "family/" prefix to BSP familiy enable

[Sebastian Huber]

On 22/07/2021 02:39, Chris Johns wrote:
> On 22/7/21 5:22 am, Sebastian Huber wrote:
>> BSP family and BSP variant names may be equal.  This prefix avoids
>> ambiguity in the enabled-by expressions.
>> ---
>>   wscript | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/wscript b/wscript
>> index f27dba6831..b7a0412150 100755
>> --- a/wscript
>> +++ b/wscript
>> @@ -1394,7 +1394,7 @@ def configure_variant(conf, cp, bsp_map, path_list, top_group, variant):
>>       conf.env["ENABLE"] = [
>>           get_compiler(conf, cp, variant),
>>           arch,
>> -        arch_family,
>> +        "family/" + arch_family,
>             "bsps/" + arch_family,
> 
> ... as discussed in the other thread? If you are happy with the change as shown
> please push.

Yes, this is good and matches with our directory layout. I checked it in 
with this change.

We could also merge the default-by-family and default-by-variant lists 
with this approach, for example:

diff --git a/spec/build/bsps/optconsolebaud.yml 
b/spec/build/bsps/optconsolebaud.yml
index 4b0869beca..0233fdd61b 100644
--- a/spec/build/bsps/optconsolebaud.yml
+++ b/spec/build/bsps/optconsolebaud.yml
@@ -6,13 +6,10 @@ build-type: option
  copyrights:
  - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
  default: 115200
-default-by-family:
-- value: 9600
-  families:
-  - powerpc/motorola_powerpc
  default-by-variant:
  - value: 9600
    variants:
+  - bsps/powerpc/motorola_powerpc
    - m68k/m5484FireEngine
    - powerpc/hsc_cm01
    - powerpc/beatnik

-- 
embedded brains GmbH
Herr Sebastian HUBER
Dornierstr. 4
82178 Puchheim
Germany
email: sebastian.huber at embedded-brains.de
phone: +49-89-18 94 741 - 16
fax:   +49-89-18 94 741 - 08

Registergericht: Amtsgericht München
Registernummer: HRB 157899
Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler
Unsere Datenschutzerklärung finden Sie hier:
https://embedded-brains.de/datenschutzerklaerung/