diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-15 10:03:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-11 17:40:06 +0000 |
commit | 6a07977e7656119741720f69e565459a760a8824 (patch) | |
tree | 611cdb9fb7b1bad4ee9e0f2baf1066c28414f802 /meta/recipes-core | |
parent | 0de0abd9e4839847abb4a9283bb9a9ee7f46f167 (diff) | |
download | poky-6a07977e7656119741720f69e565459a760a8824.tar.gz |
cross-canadian/meta-environment: Allow modification of TARGET_OS to be optional
There are some cases we want the manipulation cross-canadian performance
on TARGET_OS, there are also cases like meta-environment where we do not
want this manipulation.
We did try and use immediate expansion to avoid this problem and it
works in the non multilib case. If we have a multilib that used an
extension, like for example:
require conf/multilib.conf
MULTILIBS = "multilib:lib32 multilib:lib64"
DEFAULTTUNE = "mips32r2"
DEFAULTTUNE_virtclass-multilib-lib32 = "mips64-n32"
DEFAULTTUNE_virtclass-multilib-lib64 = "mips64"
then the n32 extension case will be misconfigured.
It turns out saving an unexpanded variable is hard. The best I could
come up with was:
SAVEDTOS := "${@d.getVar('TARGET_OS', False).replace("{", "*")}"
and then
localdata.setVar("TARGET_OS", d.getVar("SAVEDOS", False).replace('*','{'))
which is rather evil, I'd challenge someone to come up with a nicer way
of making it work though!
Rather than the above madness, we modify cross-canadian to make the
problamtic code conditional.
This fixes the original issue (where a linux-gnuspe target was seeing
'linux') of
http://cgit.openembedded.org/openembedded-core/commit/?id=0038634ee6e2b6035c023a2702547f20f67c103a
but also fixes the multilib one.
(From OE-Core rev: 85ff3d6491c54aa712ed238c561742cda4f4ba07)
(From OE-Core rev: 78a2eeea4e2ef867437c315337b9188e1f3fa759)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index bb208a39aa..90959b5fce 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb | |||
@@ -6,9 +6,9 @@ PR = "r8" | |||
6 | 6 | ||
7 | EXCLUDE_FROM_WORLD = "1" | 7 | EXCLUDE_FROM_WORLD = "1" |
8 | 8 | ||
9 | ORIGOS := "${TARGET_OS}" | 9 | MODIFYTOS = "0" |
10 | 10 | ||
11 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${ORIGOS}" | 11 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" |
12 | 12 | ||
13 | inherit toolchain-scripts | 13 | inherit toolchain-scripts |
14 | TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" | 14 | TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" |
@@ -31,7 +31,6 @@ python do_generate_content() { | |||
31 | 31 | ||
32 | # make sure we only use the SDKTARGETSYSROOT value from 'd' | 32 | # make sure we only use the SDKTARGETSYSROOT value from 'd' |
33 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) | 33 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) |
34 | localdata.setVar('TARGET_OS', d.getVar('ORIGOS', True)) | ||
35 | localdata.setVar('libdir', d.getVar('target_libdir', False)) | 34 | localdata.setVar('libdir', d.getVar('target_libdir', False)) |
36 | 35 | ||
37 | # Process DEFAULTTUNE | 36 | # Process DEFAULTTUNE |