Merge lp:~mabac/linaro-image-tools/igep-fix into lp:linaro-image-tools/11.11

[Mattias Backman]

Hi,

This branch removes the assert that checks for uboot_flavor when uboot_in_boot_part is True. Instead we assert that an actual uboot file is found.

This resolves the issue where l-m-c fails for igep when the uboot_in_boot_part field in hwpacks v2 is set but the uboot_flavor never was set in l-m-c.

Thanks,

Mattias

[Guilherme Salgado (salgado)]

Looks good to me

review: Approve

[Ricardo Salveti (rsalveti)]

Just tested and it ran fine, also copying u-boot.bin to the first partition.

review: Approve

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-08-31 13:35:02 +0000
+++ linaro_image_tools/media_create/boards.py	2011-09-12 11:07:58 +0000
@@ -375,6 +375,7 @@
 
     @classmethod
     def get_file(cls, file_alias, default=None):
+        # XXX remove the 'default' parameter when V1 support is removed!
         file_in_hwpack = cls.hardwarepack_handler.get_file(file_alias)
         if file_in_hwpack is not None:
             return file_in_hwpack
@@ -594,17 +595,23 @@
         cmd_runner.run(['mkdir', '-p', boot_disk]).wait()
         with partition_mounted(boot_partition, boot_disk):
             if cls.uboot_in_boot_part:
-                assert cls.uboot_flavor is not None, (
-                    "uboot_in_boot_part is set but not uboot_flavor")
                 with cls.hardwarepack_handler:
-                    default = os.path.join(
-                        chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor,
-                        'u-boot.img')
-                    if not os.path.exists(default):
+                    # <legacy v1 support>
+                    if cls.uboot_flavor is not None:
                         default = os.path.join(
                             chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor,
-                            'u-boot.bin')
+                            'u-boot.img')
+                        if not os.path.exists(default):
+                            default = os.path.join(
+                                chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor,
+                                'u-boot.bin')
+                    else:
+                        default = None
+                    # </legacy v1 support>
                     uboot_bin = cls.get_file('u_boot', default=default)
+                    assert uboot_bin is not None, (
+                        "uboot binary could not be found")
+
                     proc = cmd_runner.run(
                         ['cp', '-v', uboot_bin, boot_disk], as_root=True)
                     proc.wait()