From dee005b6e1bc353230f9f27a469b2054a644e542 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 1 Jun 2015 22:14:10 +0100 Subject: 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 --- meta/conf/machine/include/soc-family.inc | 1 + 1 file changed, 1 insertion(+) 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}' != '']}" -- cgit 1.2.3-korg