Linaro Image Tools

Merge lp:~riku-voipio/linaro-image-tools/linaro-image-tools into lp:linaro-image-tools/11.11

  1. linaro-image-tools
  2. Merge into trunk
Proposed by Riku Voipio
Status: Merged
Approved by: Данило Шеган
Approved revision: 518
Merged at revision: 519
Proposed branch: lp:~riku-voipio/linaro-image-tools/linaro-image-tools
Merge into: lp:linaro-image-tools/11.11
Diff against target: 18 lines (+4/-3)
1 file modified
linaro_image_tools/media_create/boards.py (+4/-3)
To merge this branch: bzr merge lp:~riku-voipio/linaro-image-tools/linaro-image-tools
Reviewer Review Type Date Requested Status
Данило Шеган (community) Approve
Review via email: mp+106591@code.launchpad.net

Description of the change

FastModel: Make ancillary files optional

We don't need all files in all cases:

1) in case of integrated switcher, we just need the .axf file
2) in case of reference switcher, we need axf, zimage, and dtb
3) in case of kvm, we need zimage

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro_image_tools/media_create/boards.py'
2--- linaro_image_tools/media_create/boards.py 2012-05-16 07:17:13 +0000
3+++ linaro_image_tools/media_create/boards.py 2012-05-21 08:50:28 +0000
4@@ -1368,10 +1368,11 @@
5 d_img_data):
6 output_dir=os.path.dirname(boot_device_or_file)
7
8- copy_drop(_get_file_matching("%s/boot/img.axf" % chroot_dir), output_dir)
9+ bootwrapper=_get_file_matching("%s/boot/img.axf" % chroot_dir)
10
11- for filename in (k_img_data, i_img_data, d_img_data):
12- copy_drop(filename, output_dir)
13+ for filename in (bootwrapper, k_img_data, i_img_data, d_img_data):
14+ if filename != None:
15+ copy_drop(filename, output_dir)
16
17 class SamsungConfig(BoardConfig):
18 @classproperty

Subscribers

People subscribed via source and target branches