diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/fsl-dynamic-packagearch.bbclass | 28 | ||||
| -rw-r--r-- | classes/fsl-eula-unpack.bbclass | 8 | ||||
| -rw-r--r-- | classes/machine-overrides-extender.bbclass | 6 | ||||
| -rw-r--r-- | classes/qoriq_build_64bit_kernel.bbclass | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass index a7cc53fc..9fcf37be 100644 --- a/classes/fsl-dynamic-packagearch.bbclass +++ b/classes/fsl-dynamic-packagearch.bbclass @@ -26,22 +26,22 @@ # Copyright 2013-2016 (C) O.S. Systems Software LTDA. python __anonymous () { - machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split()) - machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER", True) or "").split()) + machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER") or "").split()) + machine_socarch_filter = set((d.getVar("MACHINE_SOCARCH_FILTER") or "").split()) if machine_socarch_filter or machine_arch_filter: - provides = set((d.getVar("PROVIDES", True) or "").split()) - depends = set((d.getVar("DEPENDS", True) or "").split()) - PN = d.getVar("PN", True) + provides = set((d.getVar("PROVIDES") or "").split()) + depends = set((d.getVar("DEPENDS") or "").split()) + PN = d.getVar("PN") package_arch = None if list(machine_arch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_ARCH", True) + package_arch = d.getVar("MACHINE_ARCH") elif list(machine_socarch_filter & (provides | depends)): - package_arch = d.getVar("MACHINE_SOCARCH", True) + package_arch = d.getVar("MACHINE_SOCARCH") if not package_arch: raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH as MACHINE_SOCARCH_FILTER is set for this SoC.") - machine_socarch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX", True) + machine_socarch_suffix = d.getVar("MACHINE_SOCARCH_SUFFIX") if not machine_socarch_suffix: raise bb.parse.SkipPackage("You must set MACHINE_SOCARCH_SUFFIX as MACHINE_SOCARCH_FILTER is set for this SoC.") @@ -49,18 +49,18 @@ python __anonymous () { bb.debug(1, "Use '%s' as package architecture for '%s'" % (package_arch, PN)) d.setVar("PACKAGE_ARCH", package_arch) - cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split() - machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "") + cur_package_archs = (d.getVar("PACKAGE_ARCHS") or "").split() + machine_socarch = (d.getVar("MACHINE_SOCARCH") or "") if not machine_socarch in cur_package_archs: d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch) - if d.getVar("TUNE_ARCH", True) == "arm": + if d.getVar("TUNE_ARCH") == "arm": # For ARM we have two possible machine_socarch values, one for the arm and one for the thumb instruction set # add the other value to extra archs also, so that a image recipe searches both for packages. - if d.getVar("ARM_INSTRUCTION_SET", True) == "thumb": - d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH", True)) + if d.getVar("ARM_INSTRUCTION_SET") == "thumb": + d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH")) else: - d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH", True)) + d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH")) } MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}" diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 198a1944..03f576e5 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM_append = " file://${FSL_EULA_FILE};md5=ab61cab9599935bfe9f70040 LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE" python fsl_bin_do_unpack() { - src_uri = (d.getVar('SRC_URI', True) or "").split() + src_uri = (d.getVar('SRC_URI') or "").split() if len(src_uri) == 0: return @@ -44,9 +44,9 @@ python fsl_bin_do_unpack() { } python do_unpack() { - eula = d.getVar('ACCEPT_FSL_EULA', True) - eula_file = d.getVar('FSL_EULA_FILE', True) - pkg = d.getVar('PN', True) + eula = d.getVar('ACCEPT_FSL_EULA') + eula_file = d.getVar('FSL_EULA_FILE') + pkg = d.getVar('PN') if eula == None: bb.fatal("To use '%s' you need to accept the Freescale EULA at '%s'. " "Please read it and in case you accept it, write: " diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass index 959fdc16..4b7d66d5 100644 --- a/classes/machine-overrides-extender.bbclass +++ b/classes/machine-overrides-extender.bbclass @@ -15,18 +15,18 @@ # Copyright 2016-2018 (C) O.S. Systems Software LTDA. def machine_overrides_extender(d): - machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES', True) or '').split(':') + machine_overrides = (d.getVar('PRISTINE_MACHINEOVERRIDES') or '').split(':') # Gather the list of overrides to filter out machine_overrides_filter_out = [] for override in machine_overrides: - machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override, True) or '').split() + machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT_%s' % override) or '').split() # Drop any overrides of filter_out prior extending machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out] for override in machine_overrides: - extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override, True) + extender = d.getVar('MACHINEOVERRIDES_EXTENDER_%s' % override) if extender: extender = extender.split(':') diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass index 2209e339..ffa67c8c 100644 --- a/classes/qoriq_build_64bit_kernel.bbclass +++ b/classes/qoriq_build_64bit_kernel.bbclass @@ -12,7 +12,7 @@ python () { d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options) d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False)) - error_qa = d.getVar('ERROR_QA', True) + error_qa = d.getVar('ERROR_QA') if 'arch' in error_qa: d.setVar('ERROR_QA', error_qa.replace(' arch', '')) } |