mirror of
https://git.yoctoproject.org/poky
synced 2026-04-05 08:02:25 +02:00
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -18,7 +18,7 @@ valid_archs = "alpha cris ia64 \
|
||||
def map_kernel_arch(a, d):
|
||||
import re
|
||||
|
||||
valid_archs = bb.data.getVar('valid_archs', d, 1).split()
|
||||
valid_archs = d.getVar('valid_archs', 1).split()
|
||||
|
||||
if re.match('(i.86|athlon|x86.64)$', a): return 'x86'
|
||||
elif re.match('arm26$', a): return 'arm26'
|
||||
@@ -32,7 +32,7 @@ def map_kernel_arch(a, d):
|
||||
else:
|
||||
bb.error("cannot map '%s' to a linux kernel architecture" % a)
|
||||
|
||||
export ARCH = "${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)}"
|
||||
export ARCH = "${@map_kernel_arch(d.getVar('TARGET_ARCH', 1), d)}"
|
||||
|
||||
def map_uboot_arch(a, d):
|
||||
import re
|
||||
@@ -41,5 +41,5 @@ def map_uboot_arch(a, d):
|
||||
elif re.match('i.86$', a): return 'x86'
|
||||
return a
|
||||
|
||||
export UBOOT_ARCH = "${@map_uboot_arch(bb.data.getVar('ARCH', d, 1), d)}"
|
||||
export UBOOT_ARCH = "${@map_uboot_arch(d.getVar('ARCH', 1), d)}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user