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
@@ -51,8 +51,8 @@ IMAGE_TYPEDEP_hddimg = "ext4"
|
||||
IMAGE_TYPES_MASKED += "live hddimg iso"
|
||||
|
||||
python() {
|
||||
image_b = d.getVar('IMAGE_BASENAME', True)
|
||||
initrd_i = d.getVar('INITRD_IMAGE_LIVE', True)
|
||||
image_b = d.getVar('IMAGE_BASENAME')
|
||||
initrd_i = d.getVar('INITRD_IMAGE_LIVE')
|
||||
if image_b == initrd_i:
|
||||
bb.error('INITRD_IMAGE_LIVE %s cannot use image live, hddimg or iso.' % initrd_i)
|
||||
bb.fatal('Check IMAGE_FSTYPES and INITRAMFS_FSTYPES settings.')
|
||||
@@ -264,9 +264,9 @@ build_hddimg() {
|
||||
|
||||
python do_bootimg() {
|
||||
set_live_vm_vars(d, 'LIVE')
|
||||
if d.getVar("PCBIOS", True) == "1":
|
||||
if d.getVar("PCBIOS") == "1":
|
||||
bb.build.exec_func('build_syslinux_cfg', d)
|
||||
if d.getVar("EFI", True) == "1":
|
||||
if d.getVar("EFI") == "1":
|
||||
bb.build.exec_func('build_efi_cfg', d)
|
||||
bb.build.exec_func('build_hddimg', d)
|
||||
bb.build.exec_func('build_iso', d)
|
||||
|
||||
Reference in New Issue
Block a user