diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-05 21:15:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:39:11 +0000 |
commit | 022a8b58c862a1db68c2dcddc908317e5d61d92e (patch) | |
tree | 55fbd06754d21b0cad93128e0c912acc2638a959 /meta/recipes-core | |
parent | e016eb10b075e280b4e78a04e47b59a173386421 (diff) | |
download | poky-022a8b58c862a1db68c2dcddc908317e5d61d92e.tar.gz |
meta/scripts: Various getVar/getVarFlag expansion parameter fixes
There were a few straggling expansion parameter removals left for
getVar/getVarFlag where the odd whitespace meant they were missed
on previous passes. There were also some plain broken ussages such
as:
d.getVar('ALTERNATIVE_TARGET', old_name, True)
path = d.getVar('PATH', d, True)
d.getVar('IMAGE_ROOTFS', 'True')
which I've corrected (they happend to work by luck).
(From OE-Core rev: 688f7a64917a5ce5cbe12f8e5da4d47e265d240f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc-ld.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-environment-extsdk.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index 547c235eee..c26643707d 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc | |||
@@ -26,7 +26,7 @@ def glibc_dl_info(d): | |||
26 | ld_append_if_tune_exists(d, infos, ld_info_all) | 26 | ld_append_if_tune_exists(d, infos, ld_info_all) |
27 | 27 | ||
28 | #DEFAULTTUNE_MULTILIB_ORIGINAL | 28 | #DEFAULTTUNE_MULTILIB_ORIGINAL |
29 | original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True) | 29 | original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL") |
30 | if original_tune: | 30 | if original_tune: |
31 | localdata = bb.data.createCopy(d) | 31 | localdata = bb.data.createCopy(d) |
32 | localdata.setVar("DEFAULTTUNE", original_tune) | 32 | localdata.setVar("DEFAULTTUNE", original_tune) |
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb index 52012cc4fb..76d2661b10 100644 --- a/meta/recipes-core/meta/meta-environment-extsdk.bb +++ b/meta/recipes-core/meta/meta-environment-extsdk.bb | |||
@@ -6,7 +6,7 @@ PN = "meta-environment-extsdk-${MACHINE}" | |||
6 | 6 | ||
7 | create_sdk_files_append() { | 7 | create_sdk_files_append() { |
8 | local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TOPDIR'))} | 8 | local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TOPDIR'))} |
9 | local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE',True), d.getVar('TOPDIR'))} | 9 | local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE'), d.getVar('TOPDIR'))} |
10 | 10 | ||
11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative | 11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative |
12 | } | 12 | } |