diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-11-05 17:26:48 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-11-10 21:12:12 +0300 |
| commit | 8376db433f73a311d5d6acdaefb3a6cfcd034560 (patch) | |
| tree | 525858d74089fa1906033dc23549dc71eb902d60 /meta-facebook | |
| parent | d83b524fcf1bf3a0fa2851591e0abf845fbdeaa3 (diff) | |
| download | openbmc-8376db433f73a311d5d6acdaefb3a6cfcd034560.tar.xz | |
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 <patrick@stwcx.xyz>
Change-Id: Id5fa38de29c748e4ceafd5ef5c831b4f6434ea01
Diffstat (limited to 'meta-facebook')
6 files changed, 12 insertions, 10 deletions
diff --git a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc index f472cfa47..e668d4bf9 100644 --- a/meta-facebook/conf/machine/include/facebook-compute-multihost.inc +++ b/meta-facebook/conf/machine/include/facebook-compute-multihost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-compute.inc +MACHINEOVERRIDES =. "fb-compute-multihost:" -OVERRIDES .= ":fb-compute-multihost" +require conf/machine/include/facebook-compute.inc diff --git a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc index f6a868329..7b642c3c5 100644 --- a/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc +++ b/meta-facebook/conf/machine/include/facebook-compute-singlehost.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-compute.inc +MACHINEOVERRIDES =. "fb-compute-singlehost:" -OVERRIDES .= ":fb-compute-singlehost" +require conf/machine/include/facebook-compute.inc diff --git a/meta-facebook/conf/machine/include/facebook-compute.inc b/meta-facebook/conf/machine/include/facebook-compute.inc index 7d61f81e1..748a1feb4 100644 --- a/meta-facebook/conf/machine/include/facebook-compute.inc +++ b/meta-facebook/conf/machine/include/facebook-compute.inc @@ -1,3 +1,3 @@ -require conf/machine/include/facebook-withhost.inc +MACHINEOVERRIDES =. "fb-compute:" -OVERRIDES .= ":fb-compute" +require conf/machine/include/facebook-withhost.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 diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index 8567f696c..861d35f86 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -1,3 +1,5 @@ +MACHINEOVERRIDES =. "fb-withhost:" + require conf/machine/include/facebook.inc MACHINE_FEATURES += "\ @@ -12,4 +14,3 @@ VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -OVERRIDES .= ":fb-withhost" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 43a0c2222..4951a60cf 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -1,3 +1,5 @@ +DISTROOVERRIDES .= ":facebook" + MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ obmc-phosphor-fan-mgmt \ @@ -14,4 +16,3 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" -OVERRIDES .= ":facebook" |