From patchwork Thu Jul 28 17:04:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Westby X-Patchwork-Id: 3189 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D2ACB23F61 for ; Thu, 28 Jul 2011 17:04:23 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 97B16A1836B for ; Thu, 28 Jul 2011 17:04:23 +0000 (UTC) Received: by qyk10 with SMTP id 10so3555486qyk.11 for ; Thu, 28 Jul 2011 10:04:23 -0700 (PDT) Received: by 10.229.1.217 with SMTP id 25mr253117qcg.38.1311872662806; Thu, 28 Jul 2011 10:04:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs184083qcb; Thu, 28 Jul 2011 10:04:22 -0700 (PDT) Received: by 10.14.96.72 with SMTP id q48mr146502eef.23.1311872660701; Thu, 28 Jul 2011 10:04:20 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id w2si822543eem.22.2011.07.28.10.04.20; Thu, 28 Jul 2011 10:04:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QmU0R-0007T5-W3 for ; Thu, 28 Jul 2011 17:04:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id EF7082E800E for ; Thu, 28 Jul 2011 17:04:19 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 397 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Thu, 28 Jul 2011 17:04:19 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13535"; Instance="initZopeless config overlay" X-Launchpad-Hash: bc44fb0b7117810fd9165f8a2185789b42aa22a8 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 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 === 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,