[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4782/8267] runqemu: also accept -image suffix for rootfs parameter

[Emmanuele Bassi <ebassi src gnome org>]

commit 63f61a1afff677aaf24525fb7a4fdee8b5c15dea
Author: Patrick Ohly <patrick ohly intel com>
Date:   Tue Jan 10 12:11:21 2017 +0100

    runqemu: also accept -image suffix for rootfs parameter
    
    The magic detection of the rootfs parameter only worked for image
    recipes which embedd the "image" string in the middle, as in
    "core-image-minimal".
    
    Sometimes it is more natural to call an image "something-image". To
    get such an image detected by runqemu, "-image" at the end of a
    parameter must also cause that parameter to be treated as the rootfs
    parameter.
    
    Inside the image directory, "something-image" has an -<arch> suffix
    and thus no change is needed for those usages of
    re.search('-image-'). However, while at it also enhance those string
    searches a bit (no need for re; any()+map() a bit closer to the
    intended logic).
    
    (From OE-Core rev: ca0fad3ad9d75d4198388b2a3133326267fc58db)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 195f432..9181412 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -240,7 +240,7 @@ class BaseConfig(object):
             if not re.search('.qemuboot.conf$', '\n'.join(os.listdir(p)), re.M):
                 logger.info("Can't find required *.qemuboot.conf in %s" % p)
                 return False
-            if not re.search('-image-', '\n'.join(os.listdir(p))):
+            if not any(map(lambda name: '-image-' in name, os.listdir(p))):
                 logger.info("Can't find *-image-* in %s" % p)
                 return False
             return True
@@ -289,7 +289,7 @@ class BaseConfig(object):
              re.search('zImage', p) or re.search('vmlinux', p) or \
              re.search('fitImage', p) or re.search('uImage', p):
             self.kernel =  p
-        elif os.path.exists(p) and (not os.path.isdir(p)) and re.search('-image-', os.path.basename(p)):
+        elif os.path.exists(p) and (not os.path.isdir(p)) and '-image-' in os.path.basename(p):
             self.rootfs = p
             # Check filename against self.fstypes can hanlde <file>.cpio.gz,
             # otherwise, its type would be "gz", which is incorrect.
@@ -403,7 +403,7 @@ class BaseConfig(object):
                 self.kernel_cmdline_script += ' %s' % arg[len('bootparams='):]
             elif os.path.exists(arg) or (re.search(':', arg) and re.search('/', arg)):
                 self.check_arg_path(os.path.abspath(arg))
-            elif re.search('-image-', arg):
+            elif re.search(r'-image-|-image$', arg):
                 # Lazy rootfs
                 self.rootfs = arg
             else: