build: Merge default-by-family into by-variant

Prefix the BSP family name with "bsps/" to make it distinct to the BSP
variant names.

Update #4468.
This commit is contained in:
Sebastian Huber
2021-07-23 08:45:07 +02:00
parent 75af5be6a8
commit ebdfa24bff
762 changed files with 7 additions and 768 deletions

10
wscript
View File

@@ -698,10 +698,12 @@ class OptionItem(Item):
if OptionItem._is_variant(default["variants"], variant):
value = default["value"]
break
for default in self.data["default-by-family"]:
if OptionItem._is_variant(default["families"], family):
value = default["value"]
break
else:
family = "bsps/" + family
for default in self.data["default-by-variant"]:
if OptionItem._is_variant(default["variants"], family):
value = default["value"]
break
if value is None:
return value
if isinstance(value, list):