diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/sanity.bbclass | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 4f57770157..b02036f9c5 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -12,7 +12,7 @@ INITRAMFS_TASK ?= "" INITRAMFS_IMAGE_BUNDLE ?= "" python __anonymous () { - kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or '' + kerneltype = d.getVar('KERNEL_IMAGETYPE', True) if kerneltype == 'uImage': depends = d.getVar("DEPENDS", True) depends = "%s u-boot-mkimage-native" % depends 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): bb.debug(2, " %s: %s" % (feature, valid_tunes[feature])) else: tune_errors.append("Feature '%s' is not defined." % feature) - whitelist = localdata.getVar("TUNEABI_WHITELIST", True) or '' - override = localdata.getVar("TUNEABI_OVERRIDE", True) or '' + whitelist = localdata.getVar("TUNEABI_WHITELIST", True) if whitelist: - tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune, True) or '' + tuneabi = localdata.getVar("TUNEABI_tune-%s" % tune, True) if not tuneabi: tuneabi = tune if True not in [x in whitelist.split() for x in tuneabi.split()]: @@ -265,7 +264,7 @@ def check_connectivity(d): # CONNECTIVITY_CHECK_URIS are set network_enabled = not d.getVar('BB_NO_NETWORK', True) check_enabled = len(test_uris) - # Take a copy of the data store and unset MIRRORS and PREMIRROS + # Take a copy of the data store and unset MIRRORS and PREMIRRORS data = bb.data.createCopy(d) data.delVar('PREMIRRORS') data.delVar('MIRRORS') |