diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-01 22:14:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:16 +0100 |
| commit | d31b9e6326783dda6c953c3dac3fd50bcabaac37 (patch) | |
| tree | e056309c5cf85711637a62bf5a1e7b974849932c /meta/conf | |
| parent | 20eab30866eb469e5c02f2e68da973dfe42217b9 (diff) | |
| download | ast2050-yocto-poky-d31b9e6326783dda6c953c3dac3fd50bcabaac37.zip ast2050-yocto-poky-d31b9e6326783dda6c953c3dac3fd50bcabaac37.tar.gz | |
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)
(From OE-Core rev: 7c763846bca4347d6b9e8cc388ad075f00123235)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/soc-family.inc | 1 |
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 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}' != '']}" |
