From patchwork Tue Sep 4 04:46:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 11158 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 121D423E02 for ; Tue, 4 Sep 2012 04:46:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 82B2CA18AB0 for ; Tue, 4 Sep 2012 04:45:25 +0000 (UTC) Received: by ieak11 with SMTP id k11so4011087iea.11 for ; Mon, 03 Sep 2012 21:46:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=3Kl5/N/0P3NQqR7E8HvBYPeqEI0Vm8GeItTAl9+AHjo=; b=KRCw1VG/OTj7i7kXriK8KS4o+rLIpMwA34CjJIPa2EQx6Bsd8GrKRGcU8oU+EAtqZ5 e2HCUO6dTCIXzyodqZcjCArloV9X1FACs7s4LoY4icZoSpu+AA7xCc8w6Ruhnmh1iO8f EMp2x8hA0i4xw2K+/uGbL8Y0yrkc76BJ9TfKf6GQmSPeFHDfydxYZvly1mS5Xt7ezFdj mqW+1t0+niSf7Ysq8T2ctCuzc3XrukNvP4z3IWW9V16x/iQ/qqks56lnGuIdqDWf1j6r HwnKgfLqRShoIVeh2XGbDG9o81EQc0GCU1k9xgo6J9Fes64SvvHE+3SMJBcFxlpi0iLO awJw== Received: by 10.42.60.139 with SMTP id q11mr16752469ich.53.1346733973998; Mon, 03 Sep 2012 21:46:13 -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.50.184.232 with SMTP id ex8csp166796igc; Mon, 3 Sep 2012 21:46:13 -0700 (PDT) Received: by 10.216.207.167 with SMTP id n39mr11777932weo.23.1346733972517; Mon, 03 Sep 2012 21:46:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n48si19586768wea.76.2012.09.03.21.46.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Sep 2012 21:46:12 -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 1T8l1e-0001Ih-Uc for ; Tue, 04 Sep 2012 04:46:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id D5C28E16A8 for ; Tue, 4 Sep 2012 04:46:10 +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: 556 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 556: Change the arguments of function _get_bootcmd() for fastmodels to match the overriden function. Message-Id: <20120904044610.23457.3195.launchpad@ackee.canonical.com> Date: Tue, 04 Sep 2012 04:46:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15890"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: fff598f2a54248c2afa9a78ba7ee87b79999bfbb X-Gm-Message-State: ALoCoQk28fEQR5ZRlzGK6uhMrTCEf4qa45n+GAm7ZPwTk0b8PtCPL7/2mWroLyJvKza7/uUHV9iR Merge authors: Riku Voipio Related merge proposals: https://code.launchpad.net/~riku-voipio/linaro-image-tools/fix-fastmodel-builds/+merge/122479 proposed by: Riku Voipio (riku-voipio) review: Approve - Ricardo Salveti (rsalveti) ------------------------------------------------------------ revno: 556 [merge] committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Tue 2012-09-04 07:45:05 +0300 message: Change the arguments of function _get_bootcmd() for fastmodels to match the overriden function. 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 2012-08-27 00:51:26 +0000 +++ linaro_image_tools/media_create/boards.py 2012-09-03 08:25:05 +0000 @@ -1385,7 +1385,7 @@ supports_writing_to_mmc = False @classmethod - def _get_bootcmd(cls, d_img_data): + def _get_bootcmd(cls, i_img_data, d_img_data): """Get the bootcmd for FastModel. We override this as we don't do uboot.