From 8376db433f73a311d5d6acdaefb3a6cfcd034560 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 5 Nov 2021 09:26:48 -0500 Subject: meta-facebook: revamp OVERRIDES Ensure OVERRIDES are specific, MACHINE or DISTRO, rather than extending the primary OVERRIDES variable. Fix the order so that the variables are ordered from least-specific to most-specific since bitbake applies overrides in increasing order. This makes it so that 'fb-withhost' is applied before 'fb-compute-multihost' is applied before 'yosemitev2'. Thus, if a recipe has a specialization for 'yosemitev2' it is used rather than the weaker specialization for 'fb-withhost'. Tested by checking the OVERRIDES and MACHINEOVERRIDES for Bletchley, Tiogapass, and Yosemitev2 to verify they look correct. ``` MACHINEOVERRIDES="armv7a:aspeed:aspeed-g6:fb-nohost:bletchley" MACHINEOVERRIDES="armv6:aspeed:aspeed-g5:fb-withhost:fb-compute:fb-compute-singlehost:tiogapass" MACHINEOVERRIDES="armv6:aspeed:aspeed-g5:fb-withhost:fb-compute:fb-compute-multihost:yosemitev2" ``` Signed-off-by: Patrick Williams Change-Id: Id5fa38de29c748e4ceafd5ef5c831b4f6434ea01 --- meta-facebook/conf/machine/include/facebook-nohost.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-facebook/conf/machine/include/facebook-nohost.inc') diff --git a/meta-facebook/conf/machine/include/facebook-nohost.inc b/meta-facebook/conf/machine/include/facebook-nohost.inc index e9af8e94d..a98da9979 100644 --- a/meta-facebook/conf/machine/include/facebook-nohost.inc +++ b/meta-facebook/conf/machine/include/facebook-nohost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook.inc +MACHINEOVERRIDES =. "fb-nohost:" -OVERRIDES .= ":fb-nohost" +require conf/machine/include/facebook.inc -- cgit v1.2.3