From patchwork Tue Oct 16 00:02:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 12250 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 49C4723EF8 for ; Tue, 16 Oct 2012 00:02:18 +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 CE89AA18106 for ; Tue, 16 Oct 2012 00:02:17 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so8607859iej.11 for ; Mon, 15 Oct 2012 17:02:17 -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=/FyUY6+/F8gdHvYVSu9XtLGkWkKIJIpUKgt5dAWiOZU=; b=RyCcYNi28UKY7W8AuBADiF/sLy+geB0vA8ogaiQ7+gySyjLgMFk6uQ2xY7EUsh1ESa 7wsil09p+uHupWJVlLk6b5YOrEwYNgypiqk1Wa3LpNODgPoWLkOA2C9Uob2sjiZuTg/r bLLuOYkBJpe4DkWVyn5f+l+qWwONQS75cmIaJVxlB4eKhsYrd0MfucK893Y3FbV2vEL/ rqF5MmeWLE9mV1zpvow1vgqVhQiyCEijHnGthko9EP+QhtqINIXXGXZXEmR5di92D8Mz nU+RfXBSUTUHIicSwMXu8arMGl938gkWJPVhYuKqSvx1UecVRsxP11UYLoAeqsumMhuk T9tQ== Received: by 10.50.87.134 with SMTP id ay6mr10284120igb.70.1350345737268; Mon, 15 Oct 2012 17:02: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.50.67.148 with SMTP id n20csp653672igt; Mon, 15 Oct 2012 17:02:16 -0700 (PDT) Received: by 10.180.79.103 with SMTP id i7mr27327886wix.13.1350345735710; Mon, 15 Oct 2012 17:02:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id t69si18583591weo.28.2012.10.15.17.02.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 17:02:15 -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 1TNubv-00074Z-1a for ; Tue, 16 Oct 2012 00:02:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id EF09BE0167 for ; Tue, 16 Oct 2012 00:02:14 +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: 401 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 401: update the sed command for mount sdcard of android image with the mount point of /storage/sdcard0 Message-Id: <20121016000214.11151.28512.launchpad@ackee.canonical.com> Date: Tue, 16 Oct 2012 00:02: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="16137"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 2387e6b689b2fe0fadbd961b0a3e45191b53d294 X-Gm-Message-State: ALoCoQlei06dinyD/L6x3Q6kugZyNbNvoRaEu1IHIDu2+Cmv8ay9Sx3rpZiSKyITkR/a+voevZED Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-dispatcher/sdcard-mount/+merge/129693 proposed by: Yongqin Liu (liuyq0307) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 401 [merge] committer: Yongqin Liu branch nick: lava-dispatcher timestamp: Mon 2012-10-15 17:00:41 -0700 message: update the sed command for mount sdcard of android image with the mount point of /storage/sdcard0 modified: lava_dispatcher/config.py lava_dispatcher/device/master.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/config.py' --- lava_dispatcher/config.py 2012-10-02 20:54:32 +0000 +++ lava_dispatcher/config.py 2012-10-15 15:22:51 +0000 @@ -65,6 +65,7 @@ tester_hostname = schema.StringOption(default="linaro") tester_str = schema.StringOption() val = schema.StringOption() + sdcard_mountpoint_path = schema.StringOption(default="/storage/sdcard0") simulator_binary = schema.StringOption() license_server = schema.StringOption() === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2012-10-15 15:15:14 +0000 +++ lava_dispatcher/device/master.py 2012-10-16 00:00:41 +0000 @@ -610,10 +610,12 @@ # If there is no userdata partition on the sdcard(like iMX and Origen), # then the sdcard partition will be used as the userdata partition as # before, and so cannot be used here as the sdcard on android - original = 'dev_mount sdcard /mnt/sdcard %s ' % ( + original = 'dev_mount sdcard %s %s ' % ( + target.config.sdcard_mountpoint_path, target.config.sdcard_part_android_org) - replacement = 'dev_mount sdcard /mnt/sdcard %s ' % ( - target.sdcard_part_lava) + replacement = 'dev_mount sdcard %s %s ' % ( + target.config.sdcard_mountpoint_path, + target.config.sdcard_part_android) sed_cmd = "s@{original}@{replacement}@".format(original=original, replacement=replacement) session.run(