mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -4,12 +4,12 @@
|
||||
#
|
||||
|
||||
def qemu_target_binary(data):
|
||||
package_arch = data.getVar("PACKAGE_ARCH", True)
|
||||
qemu_target_binary = (data.getVar("QEMU_TARGET_BINARY_%s" % package_arch, True) or "")
|
||||
package_arch = data.getVar("PACKAGE_ARCH")
|
||||
qemu_target_binary = (data.getVar("QEMU_TARGET_BINARY_%s" % package_arch) or "")
|
||||
if qemu_target_binary:
|
||||
return qemu_target_binary
|
||||
|
||||
target_arch = data.getVar("TARGET_ARCH", True)
|
||||
target_arch = data.getVar("TARGET_ARCH")
|
||||
if target_arch in ("i486", "i586", "i686"):
|
||||
target_arch = "i386"
|
||||
elif target_arch == "powerpc":
|
||||
@@ -26,7 +26,7 @@ def qemu_wrapper_cmdline(data, rootfs_path, library_paths):
|
||||
if qemu_binary == "qemu-allarch":
|
||||
qemu_binary = "qemuwrapper"
|
||||
|
||||
qemu_options = data.getVar("QEMU_OPTIONS", True)
|
||||
qemu_options = data.getVar("QEMU_OPTIONS")
|
||||
|
||||
return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + qemu_options + " -L " + rootfs_path\
|
||||
+ " -E LD_LIBRARY_PATH=" + ":".join(library_paths) + " "
|
||||
@@ -52,7 +52,7 @@ def qemu_run_binary(data, rootfs_path, binary):
|
||||
# this dance). For others (e.g. arm) a -cpu option is not necessary, since the
|
||||
# qemu-arm default CPU supports all required architecture levels.
|
||||
|
||||
QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH', True), True) or ""}"
|
||||
QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS_%s" % d.getVar('PACKAGE_ARCH'), True) or ""}"
|
||||
QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
|
||||
|
||||
QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
|
||||
|
||||
Reference in New Issue
Block a user