Make it easier to build from branches and run a specific image

Is is now easy to build a specific branch by adding the following line to
local.conf

BRANCH_pn-aktualizr = "mybranchname"

Also, the run-qemu-ota script can also take a path to an image file, which is
useful for long-term test images.

1 files changed, 7 insertions, 3 deletions

diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota
index 7f84d08..5334814 100755
--- a/scripts/run-qemu-ota
+++ b/scripts/run-qemu-ota
@@ -60,8 +60,11 @@ class QemuCommand(object):
             if not exists(uboot):
                 raise ValueError("U-Boot image %s does not exist" % uboot)
             self.bios = uboot
-        ext = EXTENSIONS.get(self.machine, 'wic')
-        image = join(args.dir, self.machine, '%s-%s.%s' % (args.imagename, self.machine, ext))
+        if exists(args.imagename):
+            image = args.imagename
+        else:
+            ext = EXTENSIONS.get(self.machine, 'wic')
+            image = join(args.dir, self.machine, '%s-%s.%s' % (args.imagename, self.machine, ext))
         self.image = realpath(image)
         if not exists(self.image):
             raise ValueError("OS image %s does not exist" % self.image)
@@ -122,7 +125,8 @@ class QemuCommand(object):
 
 def main():
     parser = ArgumentParser(description='Run meta-updater image in qemu')
-    parser.add_argument('imagename', default='core-image-minimal', nargs='?')
+    parser.add_argument('imagename', default='core-image-minimal', nargs='?',
+                        help="Either the name of the bitbake image target, or a path to the image to run")
     parser.add_argument('mac', default=None, nargs='?')
     parser.add_argument('--dir', default=DEFAULT_DIR,
                         help='Path to build directory containing the image and u-boot-qemux86-64.rom')