From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 1 Jun 2015 21:14:10 +0000 (+0100)
Subject: soc-family.inc: Add a default SOC_FAMILY value
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fd3c7e64b55bc2d984aa7fdac2f0e2ed58b9033;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

(From OE-Core rev: dee005b6e1bc353230f9f27a469b2054a644e542)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/machine/include/soc-family.inc b/meta/conf/machine/include/soc-family.inc
index 0251da079cb..1ff08998122 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}' != '']}"