From patchwork Wed Oct 26 11:09:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 4825 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 DF86823EF6 for ; Wed, 26 Oct 2011 11:09:17 +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 D2676A18BAE for ; Wed, 26 Oct 2011 11:09:17 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so1994007faa.11 for ; Wed, 26 Oct 2011 04:09:17 -0700 (PDT) Received: by 10.223.17.3 with SMTP id q3mr58384430faa.28.1319627357748; Wed, 26 Oct 2011 04:09:17 -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.1.71 with SMTP id 7cs8823lak; Wed, 26 Oct 2011 04:09:17 -0700 (PDT) Received: by 10.227.58.17 with SMTP id e17mr9087829wbh.18.1319627356203; Wed, 26 Oct 2011 04:09:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id m20si943214wbh.109.2011.10.26.04.09.15 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Oct 2011 04:09:16 -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 1RJ1MB-00060p-Gh for ; Wed, 26 Oct 2011 11:09:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 75DE3E0992 for ; Wed, 26 Oct 2011 11:09:15 +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: 454 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 454: Bring in fetch_image changes. Message-Id: <20111026110915.7635.80424.launchpad@ackee.canonical.com> Date: Wed, 26 Oct 2011 11:09:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14189"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ef8f7b779f67248431797220fab4b051887cfb65 Merge authors: James Tunnicliffe (dooferlad) Loïc Minier (lool) Related merge proposals: https://code.launchpad.net/~dooferlad/linaro-image-tools/fetch-image_use_new_lmc_params/+merge/79971 proposed by: James Tunnicliffe (dooferlad) review: Approve - James Westby (james-w) https://code.launchpad.net/~dooferlad/linaro-image-tools/11.09_fetch_image_update/+merge/78275 proposed by: James Tunnicliffe (dooferlad) ------------------------------------------------------------ revno: 454 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Wed 2011-10-26 13:07:43 +0200 message: Bring in fetch_image changes. modified: linaro_image_tools/fetch_image.py linaro_image_tools/fetch_image_settings.yaml --- 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/fetch_image.py' --- linaro_image_tools/fetch_image.py 2011-08-22 17:04:07 +0000 +++ linaro_image_tools/fetch_image.py 2011-10-20 15:00:06 +0000 @@ -597,12 +597,12 @@ "specify either an image file, or an mmc target, not both.") self.append_setting_to(args, settings, 'mmc') - self.append_setting_to(args, settings, 'image_file') - self.append_setting_to(args, settings, 'image_size') - self.append_setting_to(args, settings, 'swap_size') - self.append_setting_to(args, settings, 'swap_file') + self.append_setting_to(args, settings, 'image_file', '--image-file') + self.append_setting_to(args, settings, 'image_size', '--image-size') + self.append_setting_to(args, settings, 'swap_size', '--swap-size') + self.append_setting_to(args, settings, 'swap_file', '--swap-file') self.append_setting_to(args, settings, 'yes_to_mmc_selection', - '--nocheck_mmc') + '--nocheck-mmc') args.append("--dev") args.append(settings['hardware']) === modified file 'linaro_image_tools/fetch_image_settings.yaml' --- linaro_image_tools/fetch_image_settings.yaml 2011-09-06 20:59:09 +0000 +++ linaro_image_tools/fetch_image_settings.yaml 2011-10-05 15:54:11 +0000 @@ -133,6 +133,8 @@ - final '11.08': - final + '11.09': + - final platform: linaro-n repository: release