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 --- recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-bsp/u-boot') diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb index 73a1fdf18..bfea33274 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb @@ -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 + '-') } -- cgit v1.2.3-54-g00ecf