summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-01 22:14:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-01 22:18:14 +0100
commitdee005b6e1bc353230f9f27a469b2054a644e542 (patch)
tree0b816c86b9219db43810a75f7253000e29030415
parentf27ddf0de23871fc72cfc31f514f0e144aaa2082 (diff)
downloadopenembedded-core-contrib-dee005b6e1bc353230f9f27a469b2054a644e542.tar.gz
openembedded-core-contrib-dee005b6e1bc353230f9f27a469b2054a644e542.tar.bz2
openembedded-core-contrib-dee005b6e1bc353230f9f27a469b2054a644e542.zip
soc-family.inc: Add a default SOC_FAMILY value
Otherwise, if MACHINEOVERRIDES is expanded before SOC_FAMILY is set (which may happen as MACHINEOVERRIDES is included in OVERRIDES) we can see: ExpansionError: Failure expanding variable MACHINEOVERRIDES, expression was ${@['', '${SOC_FAMILY}:']['${SOC_FAMILY}' != '']}p1022ds which triggered exception SyntaxError: EOL while scanning string literal (MACHINEOVERRIDES, line 1) To avoid this, give SOC_FAMILY a default empty value so it doesn't get read as None. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/soc-family.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/machine/include/soc-family.inc b/meta/conf/machine/include/soc-family.inc
index 0251da079c..1ff0899812 100644
--- a/meta/conf/machine/include/soc-family.inc
+++ b/meta/conf/machine/include/soc-family.inc
@@ -1,2 +1,3 @@
# Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x'
+SOC_FAMILY ??= ""
MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}:']['${SOC_FAMILY}' != '']}"