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/lib/oe | |
| 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/lib/oe')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 6 | ||||
| -rw-r--r-- | meta/lib/oe/utils.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index e557473999..a8644cc1c0 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
| @@ -129,11 +129,9 @@ class RpmIndexer(Indexer): | |||
| 129 | if default_tune: | 129 | if default_tune: |
| 130 | localdata.setVar("DEFAULTTUNE", default_tune) | 130 | localdata.setVar("DEFAULTTUNE", default_tune) |
| 131 | bb.data.update_data(localdata) | 131 | bb.data.update_data(localdata) |
| 132 | package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS', | 132 | package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split() |
| 133 | True).split() | ||
| 134 | package_archs[eext[1]].reverse() | 133 | package_archs[eext[1]].reverse() |
| 135 | target_os[eext[1]] = localdata.getVar("TARGET_OS", | 134 | target_os[eext[1]] = localdata.getVar("TARGET_OS").strip() |
| 136 | True).strip() | ||
| 137 | 135 | ||
| 138 | ml_prefix_list = collections.OrderedDict() | 136 | ml_prefix_list = collections.OrderedDict() |
| 139 | for mlib in package_archs: | 137 | for mlib in package_archs: |
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 3de21fc030..76806b5195 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
| @@ -30,7 +30,7 @@ def less_or_equal(variable, checkvalue, truevalue, falsevalue, d): | |||
| 30 | return falsevalue | 30 | return falsevalue |
| 31 | 31 | ||
| 32 | def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): | 32 | def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): |
| 33 | result = bb.utils.vercmp_string(d.getVar(variable,True), checkvalue) | 33 | result = bb.utils.vercmp_string(d.getVar(variable), checkvalue) |
| 34 | if result <= 0: | 34 | if result <= 0: |
| 35 | return truevalue | 35 | return truevalue |
| 36 | else: | 36 | else: |
