From 014b8024c49ec35c5a3eb6c5a03b6abf2b324e72 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Thu, 3 Mar 2016 15:27:23 +0800 Subject: 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 Signed-off-by: Zhenhua Luo Signed-off-by: Otavio Salvador --- classes/qoriq_build_64bit_kernel.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'classes/qoriq_build_64bit_kernel.bbclass') diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass index f145746b..2209e339 100644 --- a/classes/qoriq_build_64bit_kernel.bbclass +++ b/classes/qoriq_build_64bit_kernel.bbclass @@ -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: -- cgit v1.2.3-54-g00ecf