|
@@ -367,7 +367,7 @@ class BaseConfig(object):
|
|
|
if p.endswith('.qemuboot.conf'):
|
|
|
self.qemuboot = p
|
|
|
self.qbconfload = True
|
|
|
- elif re.search('\.bin$', p) or re.search('bzImage', p) or \
|
|
|
+ elif re.search('\\.bin$', p) or re.search('bzImage', p) or \
|
|
|
re.search('zImage', p) or re.search('vmlinux', p) or \
|
|
|
re.search('fitImage', p) or re.search('uImage', p):
|
|
|
self.kernel = p
|
|
@@ -381,19 +381,19 @@ class BaseConfig(object):
|
|
|
fst = t
|
|
|
break
|
|
|
if not fst:
|
|
|
- m = re.search('.*\.(.*)$', self.rootfs)
|
|
|
+ m = re.search('.*\\.(.*)$', self.rootfs)
|
|
|
if m:
|
|
|
fst = m.group(1)
|
|
|
if fst:
|
|
|
self.check_arg_fstype(fst)
|
|
|
- qb = re.sub('\.' + fst + "$", '.qemuboot.conf', self.rootfs)
|
|
|
+ qb = re.sub('\\.' + fst + "$", '.qemuboot.conf', self.rootfs)
|
|
|
if os.path.exists(qb):
|
|
|
self.qemuboot = qb
|
|
|
self.qbconfload = True
|
|
|
else:
|
|
|
logger.warning("%s doesn't exist, will try to remove '.rootfs' from filename" % qb)
|
|
|
# They to remove .rootfs (IMAGE_NAME_SUFFIX) as well
|
|
|
- qb = re.sub('\.rootfs.qemuboot.conf$', '.qemuboot.conf', qb)
|
|
|
+ qb = re.sub('\\.rootfs.qemuboot.conf$', '.qemuboot.conf', qb)
|
|
|
if os.path.exists(qb):
|
|
|
self.qemuboot = qb
|
|
|
self.qbconfload = True
|