diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/kernel-arch.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-arch.bbclass')
-rw-r--r-- | meta/classes/kernel-arch.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index ea976c66b3..e09cdc4184 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass | |||
@@ -19,7 +19,7 @@ valid_archs = "alpha cris ia64 \ | |||
19 | def map_kernel_arch(a, d): | 19 | def map_kernel_arch(a, d): |
20 | import re | 20 | import re |
21 | 21 | ||
22 | valid_archs = d.getVar('valid_archs', True).split() | 22 | valid_archs = d.getVar('valid_archs').split() |
23 | 23 | ||
24 | if re.match('(i.86|athlon|x86.64)$', a): return 'x86' | 24 | if re.match('(i.86|athlon|x86.64)$', a): return 'x86' |
25 | elif re.match('armeb$', a): return 'arm' | 25 | elif re.match('armeb$', a): return 'arm' |
@@ -34,7 +34,7 @@ def map_kernel_arch(a, d): | |||
34 | else: | 34 | else: |
35 | bb.error("cannot map '%s' to a linux kernel architecture" % a) | 35 | bb.error("cannot map '%s' to a linux kernel architecture" % a) |
36 | 36 | ||
37 | export ARCH = "${@map_kernel_arch(d.getVar('TARGET_ARCH', True), d)}" | 37 | export ARCH = "${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}" |
38 | 38 | ||
39 | def map_uboot_arch(a, d): | 39 | def map_uboot_arch(a, d): |
40 | import re | 40 | import re |
@@ -43,7 +43,7 @@ def map_uboot_arch(a, d): | |||
43 | elif re.match('i.86$', a): return 'x86' | 43 | elif re.match('i.86$', a): return 'x86' |
44 | return a | 44 | return a |
45 | 45 | ||
46 | export UBOOT_ARCH = "${@map_uboot_arch(d.getVar('ARCH', True), d)}" | 46 | export UBOOT_ARCH = "${@map_uboot_arch(d.getVar('ARCH'), d)}" |
47 | 47 | ||
48 | # Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture | 48 | # Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture |
49 | # specific options necessary for building the kernel and modules. | 49 | # specific options necessary for building the kernel and modules. |