Always pass --bootloader option to linaro-media-create. Default to

u-boot when DEFAULT_BOOT_LOADER environment variable isn't set.

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/build_images.py b/build_images.py
index 2908469..12a0d4e 100755
--- a/build_images.py
+++ b/build_images.py
@@ -188,10 +188,11 @@ def build_image(lmc, imgfile, hwpack, hwpack_file, binary, binary_file):
         args.append('--preinstall-script')
         args.append(script)
 
-    default_boot_loader = os.environ.get("DEFAULT_BOOT_LOADER")
-    if default_boot_loader is not None:
-        args.append('--bootloader')
-        args.append(default_boot_loader)
+    # FIXME: work around for https://bugs.launchpad.net/bugs/1057639
+    #        [regression] linaro-media-create --bootloader option is mandatory
+    default_boot_loader = os.environ.get("DEFAULT_BOOT_LOADER", "u-boot")
+    args.append('--bootloader')
+    args.append(default_boot_loader)
 
     print "INFO: running l-m-c:", " ".join([str(arg) for arg in args])