diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 519: Do not require all of .axf file, zimage and dtb if they are not really needed for FastModel. Patc...

Message ID 20120524105117.9241.92629.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Данило Шеган May 24, 2012, 10:51 a.m. UTC 
Merge authors:
  Riku Voipio (riku-voipio)
Related merge proposals:
  https://code.launchpad.net/~riku-voipio/linaro-image-tools/linaro-image-tools/+merge/106591
  proposed by: Riku Voipio (riku-voipio)
  review: Approve - Данило Шеган (danilo)
------------------------------------------------------------
revno: 519 [merge]
committer: Danilo Segan <danilo@canonical.com>
branch nick: trunk
timestamp: Thu 2012-05-24 12:49:32 +0200
message:
  Do not require all of .axf file, zimage and dtb if they are not really needed for FastModel. Patch by Riku Voipio.
modified:
  linaro_image_tools/media_create/boards.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2012-05-16 07:17:13 +0000
+++ linaro_image_tools/media_create/boards.py	2012-05-17 12:15:15 +0000
@@ -1368,10 +1368,11 @@ 
                          d_img_data):
         output_dir=os.path.dirname(boot_device_or_file)
 
-        copy_drop(_get_file_matching("%s/boot/img.axf" % chroot_dir), output_dir)
+        bootwrapper=_get_file_matching("%s/boot/img.axf" % chroot_dir)
 
-        for filename in (k_img_data, i_img_data, d_img_data):
-            copy_drop(filename, output_dir)
+        for filename in (bootwrapper, k_img_data, i_img_data, d_img_data):
+            if filename != None:
+                copy_drop(filename, output_dir)
 
 class SamsungConfig(BoardConfig):
     @classproperty