mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
runqemu: fix special characters bug
Fix the bug in runqemu that happens when the file path contains the specific words such as 'vmlinux', e.g. /home/frank/vmlinux. runqemu - ERROR - wic doesn't need kernel (From OE-Core rev: 0276bd0e8d5cefb6f98d685bc9faa0451780bef9) Signed-off-by: Libo Chen <libo.chen.cn@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3c186fe7741adecb0887e36c8a9164a58fc16437) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
@@ -368,12 +368,13 @@ class BaseConfig(object):
|
|||||||
- Check whether it is an NFS dir
|
- Check whether it is an NFS dir
|
||||||
- Check whether it is an OVMF flash file
|
- Check whether it is an OVMF flash file
|
||||||
"""
|
"""
|
||||||
|
n = os.path.basename(p)
|
||||||
if p.endswith('.qemuboot.conf'):
|
if p.endswith('.qemuboot.conf'):
|
||||||
self.qemuboot = p
|
self.qemuboot = p
|
||||||
self.qbconfload = True
|
self.qbconfload = True
|
||||||
elif re.search('\\.bin$', p) or re.search('bzImage', p) or \
|
elif re.search('\\.bin$', n) or re.search('bzImage', n) or \
|
||||||
re.search('zImage', p) or re.search('vmlinux', p) or \
|
re.search('zImage', n) or re.search('vmlinux', n) or \
|
||||||
re.search('fitImage', p) or re.search('uImage', p):
|
re.search('fitImage', n) or re.search('uImage', n):
|
||||||
self.kernel = p
|
self.kernel = p
|
||||||
elif os.path.isfile(p) and ('-image-' in os.path.basename(p) or '.rootfs.' in os.path.basename(p)):
|
elif os.path.isfile(p) and ('-image-' in os.path.basename(p) or '.rootfs.' in os.path.basename(p)):
|
||||||
self.rootfs = p
|
self.rootfs = p
|
||||||
|
|||||||
Reference in New Issue
Block a user