mirror of
git://git.yoctoproject.org/meta-freescale.git
synced 2025-10-22 23:02:20 +02:00
classes/u-boot: Update getVar syntax
This runs: sed -e 's:\(\.getVar([^,()]*\)):\1, False):g' -i `grep -ril getVar *` on the layer to update the getVar usages without an expand parameter, This ensures the layer continues to work with bitbake master. There is no functionality change although some of these sites may benefit from expand=True. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
62c8d8cc65
commit
014b8024c4
|
@ -2,15 +2,15 @@ inherit distro_features_check
|
|||
REQUIRED_DISTRO_FEATURES_e6500 += "multiarch"
|
||||
|
||||
python () {
|
||||
promote_kernel = d.getVar('BUILD_64BIT_KERNEL')
|
||||
promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False)
|
||||
if promote_kernel == "1":
|
||||
sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR') + 'mllib64-' + d.getVar('HOST_OS')
|
||||
tc_options = d.getVar('TOOLCHAIN_OPTIONS') + '/../lib64-' + d.getVar("MACHINE")
|
||||
sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False)
|
||||
tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False)
|
||||
d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc')
|
||||
d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib)
|
||||
d.setVar('KERNEL_CC', d.getVar('CCACHE') + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH') + tc_options)
|
||||
d.setVar('KERNEL_LD', d.getVar('CCACHE') + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH') + tc_options)
|
||||
d.setVar('KERNEL_AR', d.getVar('CCACHE') + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH'))
|
||||
d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
|
||||
d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options)
|
||||
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)
|
||||
if 'arch' in error_qa:
|
||||
|
|
|
@ -39,10 +39,10 @@ python () {
|
|||
if "e5500-64b:" in arch or "e6500-64b:" in arch:
|
||||
if not "lib32" in ml:
|
||||
raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
|
||||
sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR') + 'mllib32-' + d.getVar('HOST_OS')
|
||||
sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR', False) + 'mllib32-' + d.getVar('HOST_OS', False)
|
||||
d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
|
||||
d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib)
|
||||
d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE"))
|
||||
d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
|
||||
d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE", False))
|
||||
d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-')
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user