From ebdfa24bff814134b8f42efc7ed386afcfa90eff Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 23 Jul 2021 08:45:07 +0200 Subject: 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. --- wscript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 27f65b2054..8903f1f97a 100755 --- a/wscript +++ b/wscript @@ -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): -- cgit v1.2.3