diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 13:00:43 +0000 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-02-18 13:17:54 +0800 |
commit | 2e9b383ccaf495b7d07dcc5065a6fa83fc03e501 (patch) | |
tree | 93f18b959dcbcbb9d44bb39b6d427c0821b9adaa | |
parent | cb8d8ffd03645f58b530cc62e9a943a7bf93476c (diff) | |
download | meta-fsl-ppc-2e9b383ccaf495b7d07dcc5065a6fa83fc03e501.tar.gz |
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>
-rw-r--r-- | classes/qoriq_build_64bit_kernel.bbclass | 14 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass index f145746..2209e33 100644 --- a/classes/qoriq_build_64bit_kernel.bbclass +++ b/classes/qoriq_build_64bit_kernel.bbclass | |||
@@ -2,15 +2,15 @@ inherit distro_features_check | |||
2 | REQUIRED_DISTRO_FEATURES_e6500 += "multiarch" | 2 | REQUIRED_DISTRO_FEATURES_e6500 += "multiarch" |
3 | 3 | ||
4 | python () { | 4 | python () { |
5 | promote_kernel = d.getVar('BUILD_64BIT_KERNEL') | 5 | promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False) |
6 | if promote_kernel == "1": | 6 | if promote_kernel == "1": |
7 | sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR') + 'mllib64-' + d.getVar('HOST_OS') | 7 | sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False) |
8 | tc_options = d.getVar('TOOLCHAIN_OPTIONS') + '/../lib64-' + d.getVar("MACHINE") | 8 | tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False) |
9 | d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc') | 9 | d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc') |
10 | d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib) | 10 | d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib) |
11 | d.setVar('KERNEL_CC', d.getVar('CCACHE') + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH') + tc_options) | 11 | d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options) |
12 | d.setVar('KERNEL_LD', d.getVar('CCACHE') + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH') + tc_options) | 12 | d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options) |
13 | d.setVar('KERNEL_AR', d.getVar('CCACHE') + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH')) | 13 | d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False)) |
14 | 14 | ||
15 | error_qa = d.getVar('ERROR_QA', True) | 15 | error_qa = d.getVar('ERROR_QA', True) |
16 | if 'arch' in error_qa: | 16 | if 'arch' in error_qa: |
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 7b942c7..172c757 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | |||
@@ -37,10 +37,10 @@ python () { | |||
37 | if "e5500-64b:" in arch or "e6500-64b:" in arch: | 37 | if "e5500-64b:" in arch or "e6500-64b:" in arch: |
38 | if not "lib32" in ml: | 38 | if not "lib32" in ml: |
39 | raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled") | 39 | raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled") |
40 | sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR') + 'mllib32-' + d.getVar('HOST_OS') | 40 | sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR', False) + 'mllib32-' + d.getVar('HOST_OS', False) |
41 | d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc') | 41 | d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc') |
42 | d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib) | 42 | d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib) |
43 | d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE")) | 43 | d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE", False)) |
44 | d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-') | 44 | d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-') |
45 | } | 45 | } |
46 | 46 | ||