diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-22 01:43:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 23:01:57 +0100 |
commit | eb34d6650b14332f2312ab15c8c02bfaadda222c (patch) | |
tree | 8ee8ff008d780e355f6d76d49c15b45ac492aafe /meta/classes/sanity.bbclass | |
parent | dfb55758d21145621546ac2ae49f4892f974f246 (diff) | |
download | poky-eb34d6650b14332f2312ab15c8c02bfaadda222c.tar.gz |
sanity.bbclass/kernel.bbclass: minor fixes
Fixed:
- Remove an unused line
- Remove unneeded code after d.getVar(), we don't need the "or ''" after
d.getVar() unless we need a string.
- typo: PREMIRROS -> PREMIRRORS.
(From OE-Core rev: 7849e50107a27b0ff2aaac47480ac1a0a79533dc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r-- | meta/classes/sanity.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index b5fab6a668..3b40ebec0a 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -150,10 +150,9 @@ def check_toolchain_tune(data, tune, multilib): | |||
150 | bb.debug(2, " %s: %s" % (feature, valid_tunes[feature])) | 150 | bb.debug(2, " %s: %s" % (feature, valid_tunes[feature])) |
151 | else: | 151 | else: |
152 | tune_errors.append("Feature '%s' is not defined." % feature) | 152 | tune_errors.append("Feature '%s' is not defined." % feature) |
153 | whitelist = localdata.getVar("TUNEABI_WHITELIST", True) or '' | 153 | whitelist = localdata.getVar("TUNEABI_WHITELIST", True) |
154 | override = localdata.getVar("TUNEABI_OVERRIDE", True) or '' | ||
155 | if whitelist: | 154 | if whitelist: |
156 | tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune, True) or '' | 155 | tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune, True) |
157 | if not tuneabi: | 156 | if not tuneabi: |
158 | tuneabi = tune | 157 | tuneabi = tune |
159 | if True not in [x in whitelist.split() for x in tuneabi.split()]: | 158 | if True not in [x in whitelist.split() for x in tuneabi.split()]: |
@@ -265,7 +264,7 @@ def check_connectivity(d): | |||
265 | # CONNECTIVITY_CHECK_URIS are set | 264 | # CONNECTIVITY_CHECK_URIS are set |
266 | network_enabled = not d.getVar('BB_NO_NETWORK', True) | 265 | network_enabled = not d.getVar('BB_NO_NETWORK', True) |
267 | check_enabled = len(test_uris) | 266 | check_enabled = len(test_uris) |
268 | # Take a copy of the data store and unset MIRRORS and PREMIRROS | 267 | # Take a copy of the data store and unset MIRRORS and PREMIRRORS |
269 | data = bb.data.createCopy(d) | 268 | data = bb.data.createCopy(d) |
270 | data.delVar('PREMIRRORS') | 269 | data.delVar('PREMIRRORS') |
271 | data.delVar('MIRRORS') | 270 | data.delVar('MIRRORS') |