[oe-commits] Richard Purdie : soc-family.inc: Add a default SOC_FAMILY value

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: dee005b6e1bc353230f9f27a469b2054a644e542
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dee005b6e1bc353230f9f27a469b2054a644e542

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Jun  1 22:14:10 2015 +0100

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 at linuxfoundation.org>

---

 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 0251da0..1ff0899 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}' != '']}"