From patchwork Tue Sep 13 07:50:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 4039 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 780F223EF7 for ; Tue, 13 Sep 2011 07:53:02 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 61AFCA186F6 for ; Tue, 13 Sep 2011 07:53:02 +0000 (UTC) Received: by fxe23 with SMTP id 23so410622fxe.11 for ; Tue, 13 Sep 2011 00:53:02 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr276643fah.84.1315900216153; Tue, 13 Sep 2011 00:50:16 -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.152.11.8 with SMTP id m8cs30569lab; Tue, 13 Sep 2011 00:50:15 -0700 (PDT) Received: by 10.216.185.74 with SMTP id t52mr523318wem.25.1315900214752; Tue, 13 Sep 2011 00:50:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com [91.189.90.7]) by mx.google.com with ESMTPS id z4si706946wec.55.2011.09.13.00.50.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Sep 2011 00:50:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1R3Nl0-0004s7-3L for ; Tue, 13 Sep 2011 07:50:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 0C839E0419 for ; Tue, 13 Sep 2011 07:50:14 +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: 431 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 431: Stop asserting a combination of V1 parameters for Igep v2 hwpack. Message-Id: <20110913075014.28903.33678.launchpad@ackee.canonical.com> Date: Tue, 13 Sep 2011 07:50:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13921"; Instance="initZopeless config overlay" X-Launchpad-Hash: 04628fa98944db5482fbdc5803a69fd410782a58 Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/igep-fix/+merge/74968 proposed by: Mattias Backman (mabac) review: Approve - Ricardo Salveti (rsalveti) review: Approve - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 431 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Tue 2011-09-13 09:48:23 +0200 message: Stop asserting a combination of V1 parameters for Igep v2 hwpack. 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 === 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 10:58:04 +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): + # + 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 + # 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()