diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 397: Fix the android-media-create support for imx.53 to create bootable images.

Message ID 20110728170419.13751.12746.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

James Westby July 28, 2011, 5:04 p.m. UTC 
Merge authors:
  Bernhard Rosenkraenzer (berolinux)
Related merge proposals:
  https://code.launchpad.net/~berolinux/linaro-image-tools/android-imx53-support/+merge/69576
  proposed by: Bernhard Rosenkraenzer (berolinux)
  review: Approve - James Westby (james-w)
------------------------------------------------------------
revno: 397 [merge]
committer: James Westby <james.westby@linaro.org>
branch nick: trunk
timestamp: Thu 2011-07-28 18:02:44 +0100
message:
  Fix the android-media-create support for imx.53 to create bootable images.
modified:
  linaro-android-media-create
  linaro_image_tools/media_create/android_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-android-media-create'
--- linaro-android-media-create	2011-07-26 15:35:22 +0000
+++ linaro-android-media-create	2011-07-28 00:26:09 +0000
@@ -33,6 +33,7 @@ 
     setup_partitions,
     setup_android_partitions,
     get_uuid,
+    partition_mounted,
     )
 from linaro_image_tools.media_create.rootfs import populate_partition
 from linaro_image_tools.media_create.unpack_binary_tarball import (
@@ -142,7 +143,8 @@ 
     board_config.populate_raw_partition(args.device, BOOT_DIR)
     populate_partition(BOOT_DIR + "/boot", BOOT_DISK, boot_partition)
     board_config.populate_boot_script(boot_partition, BOOT_DISK, args.consoles)
-    board_config.install_boot_loader(args.device, BOOT_DISK)
+    with partition_mounted(boot_partition, BOOT_DISK):
+        board_config.install_boot_loader(args.device, BOOT_DISK)
     populate_partition(SYSTEM_DIR + "/system", SYSTEM_DISK, system_partition)
     populate_partition(DATA_DIR + "/data", DATA_DISK, data_partition)
     print "Done creating Linaro Android image on %s" % args.device

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-07-26 15:35:22 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-07-28 00:14:53 +0000
@@ -238,7 +238,7 @@ 
 
     @classmethod
     def install_boot_loader(cls, boot_partition, boot_device_or_file):
-        install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.bin"), boot_partition, cls.LOADER_MIN_SIZE_S)
+        install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
 
 android_board_configs = {
     'beagle': AndroidBeagleConfig,