From 72a7c225e021219558f5dbacae45344b71d30a40 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 17 Jul 2019 18:50:11 -0400 Subject: 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 --- meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') 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" -- cgit v1.2.3