diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-19 18:08:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-22 13:04:23 +0100 |
| commit | 6523bc171cdd06bed9c7a36aa2198b17b9c0a016 (patch) | |
| tree | f18dd8233b1d797bdc51464d9c3b64b9b5594bf6 /meta/recipes-core | |
| parent | cc58218be4f427e4cb8659ae0b4600342c376cc8 (diff) | |
| download | poky-6523bc171cdd06bed9c7a36aa2198b17b9c0a016.tar.gz | |
meta-environment: Fix TARGET_OS problem for ppc
Due to the use of the cross-canadian inherit, TARGET_OS can be reset to
values other than the correct one, leading to generation of the wrong
files.
By expanding REAL_MULTIMACH_TARGET_SYS before the inherit, the correct
OS value is preserved and we generate the right environment files.
[YOCTO #6608]
[YOCTO #6613]
(From OE-Core rev: ae265973c96ff4b8b5580436647fc361490e134c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index cf142ef5ca..c80f8a8808 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb | |||
| @@ -6,9 +6,10 @@ PR = "r8" | |||
| 6 | 6 | ||
| 7 | EXCLUDE_FROM_WORLD = "1" | 7 | EXCLUDE_FROM_WORLD = "1" |
| 8 | 8 | ||
| 9 | REAL_MULTIMACH_TARGET_SYS := "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" | ||
| 10 | |||
| 9 | inherit toolchain-scripts | 11 | inherit toolchain-scripts |
| 10 | TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" | 12 | TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" |
| 11 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" | ||
| 12 | 13 | ||
| 13 | SDK_DIR = "${WORKDIR}/sdk" | 14 | SDK_DIR = "${WORKDIR}/sdk" |
| 14 | SDK_OUTPUT = "${SDK_DIR}/image" | 15 | SDK_OUTPUT = "${SDK_DIR}/image" |