From patchwork Wed Sep 11 14:45:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Pigott X-Patchwork-Id: 19974 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3945A248D9 for ; Wed, 11 Sep 2013 14:45:37 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ht10sf10432782vcb.9 for ; Wed, 11 Sep 2013 07:45:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=GZhB8o3+5PVaMTOx1umEOWP+/NDfGNl4xzfVPVxzEUU=; b=L0poEWscKrFWfs1hn/qCun/XRm5hdJb0m6jEDNy0NUwUxy9jNrCuwCAF1+4i6fwmc3 A5dmiPQlSStCsqcvWCRrIMmGbiX/yqgNh5MLbcWpxPvllX48LL9m0/uJNK1rjgRAccOg uqEIciRSOx1+HOr/X5M5PPedqgGxLKniJpiIDH5QG5v9YCg+2N3kYjFMhYNuswxmTQMe u114x0eVavPh2u3TQzOk6+KKuID7HrxCMzjGWcZ5MOO00bg9ijPDi6IWzeiltrHHIQGA X3Pe72tsZhiy3XGCawg+y+uPiEbD3HbM8kZ8j1g9oHq5OSry5CHN8QeYMF/lN4iM39h2 4Agg== X-Received: by 10.236.167.138 with SMTP id i10mr820734yhl.9.1378910736636; Wed, 11 Sep 2013 07:45:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.43 with SMTP id e11ls271964qej.54.gmail; Wed, 11 Sep 2013 07:45:36 -0700 (PDT) X-Received: by 10.220.169.203 with SMTP id a11mr1123579vcz.26.1378910736375; Wed, 11 Sep 2013 07:45:36 -0700 (PDT) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id x9si6124369vec.42.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 07:45:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id i3so6286980vbh.12 for ; Wed, 11 Sep 2013 07:45:36 -0700 (PDT) X-Gm-Message-State: ALoCoQnQfTGWL580Q2SQy35b4drW3gMGT7pple9pY5u1gtGSmXb2fZi05lptnA4EWW7a9K0q4MT+ X-Received: by 10.58.19.233 with SMTP id i9mr394640vee.36.1378910736279; Wed, 11 Sep 2013 07:45:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp60273vcz; Wed, 11 Sep 2013 07:45:35 -0700 (PDT) X-Received: by 10.194.240.101 with SMTP id vz5mr941354wjc.69.1378910734669; Wed, 11 Sep 2013 07:45:34 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id vs1si10687018wjc.33.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Sep 2013 07:45:34 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VJlfh-00059b-On for ; Wed, 11 Sep 2013 14:45:33 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id AF148F3000 for ; Wed, 11 Sep 2013 14:45:33 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 679 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 679: Change sdmux to masterimage type to get bootloader commands working Message-Id: <20130911144533.13998.14354.launchpad@ackee.canonical.com> Date: Wed, 11 Sep 2013 14:45:33 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16761"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 11b550d635790b94ef6185e630e35f8f081f79ab X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Dave Pigott (dpigott) Related merge proposals: https://code.launchpad.net/~dpigott/lava-dispatcher/change-sdmux-inheritance/+merge/185070 proposed by: Dave Pigott (dpigott) review: Approve - Dave Pigott (dpigott) ------------------------------------------------------------ revno: 679 [merge] committer: Dave Pigott branch nick: trunk timestamp: Wed 2013-09-11 15:45:02 +0100 message: Change sdmux to masterimage type to get bootloader commands working modified: lava_dispatcher/device/sdmux.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/device/sdmux.py' --- lava_dispatcher/device/sdmux.py 2013-09-05 09:51:15 +0000 +++ lava_dispatcher/device/sdmux.py 2013-09-11 14:43:05 +0000 @@ -30,8 +30,8 @@ from lava_dispatcher.errors import ( CriticalError, ) -from lava_dispatcher.device.target import ( - Target +from lava_dispatcher.device.master import ( + MasterImageTarget ) from lava_dispatcher.client.lmc_utils import ( generate_android_image, @@ -62,7 +62,7 @@ os.close(int(f)) -class SDMuxTarget(Target): +class SDMuxTarget(MasterImageTarget): """ This adds support for the "sd mux" device. An SD-MUX device is a piece of hardware that allows the host and target to both connect to the same SD @@ -100,7 +100,7 @@ with open('%s/etc/mkshrc' % d, 'a') as f: f.write('\n# LAVA CUSTOMIZATIONS\n') f.write('PS1="%s"\n' % self.ANDROID_TESTER_PS1) - self.deployment_data = Target.android_deployment_data + self.deployment_data = MasterImageTarget.android_deployment_data def deploy_android(self, boot, system, data): scratch = self.scratch_dir