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-03 16:38:45 +0100 |
| commit | 9fd3c7e64b55bc2d984aa7fdac2f0e2ed58b9033 (patch) | |
| tree | ddfca7db6429416258be9e907e9c21df67fe0028 /meta | |
| parent | 2389d4c57d3f77f1732db184ba1fd433bf76a490 (diff) | |
| download | poky-9fd3c7e64b55bc2d984aa7fdac2f0e2ed58b9033.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)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 0251da079c..1ff0899812 100644 --- a/meta/conf/machine/include/soc-family.inc +++ b/meta/conf/machine/include/soc-family.inc | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | # Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x' | 1 | # Add SOC_FAMILY to machine overrides so we get access to e.g. 'omap3' and 'ti335x' |
| 2 | SOC_FAMILY ??= "" | ||
| 2 | MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}:']['${SOC_FAMILY}' != '']}" | 3 | MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}:']['${SOC_FAMILY}' != '']}" |