summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 6fca7439a1..63562cf6dc 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -367,7 +367,7 @@ class BaseConfig(object):
367 if p.endswith('.qemuboot.conf'): 367 if p.endswith('.qemuboot.conf'):
368 self.qemuboot = p 368 self.qemuboot = p
369 self.qbconfload = True 369 self.qbconfload = True
370 elif re.search('\.bin$', p) or re.search('bzImage', p) or \ 370 elif re.search('\\.bin$', p) or re.search('bzImage', p) or \
371 re.search('zImage', p) or re.search('vmlinux', p) or \ 371 re.search('zImage', p) or re.search('vmlinux', p) or \
372 re.search('fitImage', p) or re.search('uImage', p): 372 re.search('fitImage', p) or re.search('uImage', p):
373 self.kernel = p 373 self.kernel = p
@@ -381,19 +381,19 @@ class BaseConfig(object):
381 fst = t 381 fst = t
382 break 382 break
383 if not fst: 383 if not fst:
384 m = re.search('.*\.(.*)$', self.rootfs) 384 m = re.search('.*\\.(.*)$', self.rootfs)
385 if m: 385 if m:
386 fst = m.group(1) 386 fst = m.group(1)
387 if fst: 387 if fst:
388 self.check_arg_fstype(fst) 388 self.check_arg_fstype(fst)
389 qb = re.sub('\.' + fst + "$", '.qemuboot.conf', self.rootfs) 389 qb = re.sub('\\.' + fst + "$", '.qemuboot.conf', self.rootfs)
390 if os.path.exists(qb): 390 if os.path.exists(qb):
391 self.qemuboot = qb 391 self.qemuboot = qb
392 self.qbconfload = True 392 self.qbconfload = True
393 else: 393 else:
394 logger.warning("%s doesn't exist, will try to remove '.rootfs' from filename" % qb) 394 logger.warning("%s doesn't exist, will try to remove '.rootfs' from filename" % qb)
395 # They to remove .rootfs (IMAGE_NAME_SUFFIX) as well 395 # They to remove .rootfs (IMAGE_NAME_SUFFIX) as well
396 qb = re.sub('\.rootfs.qemuboot.conf$', '.qemuboot.conf', qb) 396 qb = re.sub('\\.rootfs.qemuboot.conf$', '.qemuboot.conf', qb)
397 if os.path.exists(qb): 397 if os.path.exists(qb):
398 self.qemuboot = qb 398 self.qemuboot = qb
399 self.qbconfload = True 399 self.qbconfload = True