summaryrefslogtreecommitdiff
path: root/meta-ibm
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-07-18 01:50:11 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-07-24 00:26:25 +0300
commit72a7c225e021219558f5dbacae45344b71d30a40 (patch)
treec62f2db5fcaf1d0cef8b57a7aa176c0d893ed9e6 /meta-ibm
parentf2b3f9e032827f47abd2189d31555df2fe4628dd (diff)
downloadopenbmc-72a7c225e021219558f5dbacae45344b71d30a40.tar.xz
meta-ibm: witherspoon-128: MACHINEOVERRIDES fixup
The ordering of the values in MACHINEOVERRIDES is wrong: MACHINEOVERRIDES="witherspoon-128:witherspoon" This means that: FOO_witherspoon = "bar" will override: FOO_witherspoon-128 = "baz" which is the opposite of expectation. The ordering is a function of config file include order and choice of the predot vs postdot operator. Use the same include ordering and dot operators as meta-fsl-arm to get the overrides to appear in MACHINEOVERRIDES in the correct order such that the expected semantics are provided and: FOO_witherspoon-128 = "bar" will override: FOO_witherspoon = "baz" (From meta-ibm rev: a12ff8392546591d8b52927da983dd76d2c0f1bd) Change-Id: I823e236bd0147cc058052d85778b522e74fabb28 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
-rw-r--r--meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf
index a3981cc4f..d21b9b22b 100644
--- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf
+++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf
@@ -1,5 +1,5 @@
+MACHINEOVERRIDES =. "witherspoon:"
require conf/machine/witherspoon.conf
-MACHINEOVERRIDES .= ":witherspoon"
KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"