From patchwork Thu May 23 17:57:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Hart X-Patchwork-Id: 17173 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C36752395B for ; Thu, 23 May 2013 17:58:25 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c13sf2589300eek.0 for ; Thu, 23 May 2013 10:57:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :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:x-original-sender :x-original-authentication-results:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=zcA+6lxHj84HG/HPLITC29to+Nm4pKhO8e+SSw4vwsA=; b=NQuDUEHY5NVkyWJtgGC3kBDxnuWQiJfetVn3if7Z4+2FX9v2KsXWZNR6ZDyZtZy/Ap X2i7O1vEUoLBt34Tzt9lCGar5A1JE+8Egx9A2YS3LxamLQW2MWrrxuflpxcpdxm7DsWj 8CpAy3EXhcnfcFCCiSjg8RKqJqGwBsz4CpzhARuedwoT1EGN/37SauhCaRZ+fCEPGfgK CCswt9z2mIXoT6H4mhB/I0j8pSEDB5qzW9mmbOWqCY1fQgyFvI3WoFcGK4mLo4zq1Le3 SAX4RgbSSxMG0d2bjPJS2pw8cbRMKqdvc0yUW4UlRZOjzXa0GrXkdSZBKi1sahbMh9qU T1sQ== X-Received: by 10.180.160.212 with SMTP id xm20mr6466818wib.0.1369331848627; Thu, 23 May 2013 10:57:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.160.130 with SMTP id xk2ls21733wib.15.gmail; Thu, 23 May 2013 10:57:28 -0700 (PDT) X-Received: by 10.180.108.168 with SMTP id hl8mr26966815wib.23.1369331848422; Thu, 23 May 2013 10:57:28 -0700 (PDT) Received: from mail-ve0-x22b.google.com (mail-ve0-x22b.google.com [2607:f8b0:400c:c01::22b]) by mx.google.com with ESMTPS id fa9si15216802wib.124.2013.05.23.10.57.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 May 2013 10:57:28 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22b is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22b; Received: by mail-ve0-f171.google.com with SMTP id m1so2711308ves.30 for ; Thu, 23 May 2013 10:57:27 -0700 (PDT) X-Received: by 10.52.163.207 with SMTP id yk15mr5141828vdb.42.1369331847031; Thu, 23 May 2013 10:57:27 -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.126.138 with SMTP id c10csp63488vcs; Thu, 23 May 2013 10:57:26 -0700 (PDT) X-Received: by 10.180.189.68 with SMTP id gg4mr26655641wic.27.1369331835047; Thu, 23 May 2013 10:57:15 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id nf5si397244wic.115.2013.05.23.10.57.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 May 2013 10:57: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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1UfZlK-0000H4-89 for ; Thu, 23 May 2013 17:57:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 304F5E086A for ; Thu, 23 May 2013 17:57: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: 609 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 609: Add support for rootfs on USB Flash for TC2 boards Message-Id: <20130523175714.22840.44528.launchpad@ackee.canonical.com> Date: Thu, 23 May 2013 17:57:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16640"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 7cb83a99500fa52676041480054ea4ec4e137bbb X-Gm-Message-State: ALoCoQl4WXX4Cm90w5VRDcovbVjEpoZUs2KduroZVjZWYcf39XoJcTJgeYUVeFK6dWTNW7tPaDJR X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22b 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: Matt Hart Related merge proposals: https://code.launchpad.net/~matthew-hart/lava-dispatcher/rootfs-tc2-on-usb/+merge/165349 proposed by: Matthew Hart (matthew-hart) review: Approve - Tyler Baker (tyler-baker) review: Approve - Antonio Terceiro (terceiro) ------------------------------------------------------------ revno: 609 [merge] committer: Matt Hart branch nick: lava-dispatcher timestamp: Thu 2013-05-23 18:56:42 +0100 message: Add support for rootfs on USB Flash for TC2 boards modified: lava_dispatcher/config.py lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf 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 2013-05-16 01:53:21 +0000 +++ lava_dispatcher/config.py 2013-05-23 11:08:00 +0000 @@ -94,6 +94,8 @@ android_boot_prompt_timeout = schema.IntOption(default=1200) android_orig_block_device = schema.StringOption(default="mmcblk0") android_lava_block_device = schema.StringOption(default="mmcblk0") + partition_padding_string_org = schema.StringOption(default="p") + partition_padding_string_android = schema.StringOption(default="p") arm_probe_binary = schema.StringOption(default='/usr/local/bin/arm-probe') arm_probe_config = schema.StringOption(default='/usr/local/etc/arm-probe-config') === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2013-05-14 18:58:37 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2013-05-23 17:51:36 +0000 @@ -79,7 +79,6 @@ sys_part_android = 5 # sdcard partition number in LAVA test image, counting from 1 sdcard_part_android = 7 - # data partition number in LAVA test image, counting from 1 data_part_android = 6 === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf 2013-05-02 21:43:14 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf 2013-05-23 11:08:00 +0000 @@ -27,3 +27,10 @@ vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD read_boot_cmds_from_image = 0 + +android_orig_block_device = mmcblk0 +android_lava_block_device = sda +partition_padding_string_android = +sys_part_android = 1 +sdcard_part_android = 3 +data_part_android = 2 \ No newline at end of file === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2013-05-20 06:37:29 +0000 +++ lava_dispatcher/device/master.py 2013-05-23 11:08:00 +0000 @@ -649,20 +649,24 @@ sys_part_org = session._client.config.sys_part_android_org cache_part_org = session._client.config.cache_part_android_org data_part_org = session._client.config.data_part_android_org + partition_padding_string_org = session._client.config.partition_padding_string_org + # Sdcard layout in Lava image sys_part_lava = session._client.config.sys_part_android data_part_lava = session._client.config.data_part_android - - # delete use of cache partition - session.run('sed -i "/\/dev\/block\/mmcblk0p%s/d" %s' - % (cache_part_org, rc_filename)) + partition_padding_string_lava = session._client.config.partition_padding_string_android blkorg = session._client.config.android_orig_block_device blklava = session._client.config.android_lava_block_device - session.run('sed -i "s/%sp%s/%sp%s/g" %s' - % (blkorg, data_part_org, blklava, data_part_lava, rc_filename)) - session.run('sed -i "s/%sp%s/%sp%s/g" %s' - % (blkorg, sys_part_org, blklava, sys_part_lava, rc_filename)) + + # delete use of cache partition + session.run('sed -i "/\/dev\/block\/%s%s%s/d" %s' + % (blkorg, partition_padding_string_org, cache_part_org, rc_filename)) + session.run('sed -i "s/%s%s%s/%s%s%s/g" %s' + % (blkorg, partition_padding_string_org, data_part_org, blklava, partition_padding_string_lava, data_part_lava, rc_filename)) + session.run('sed -i "s/%s%s%s/%s%s%s/g" %s' + % (blkorg, partition_padding_string_org, sys_part_org, blklava, partition_padding_string_lava, sys_part_lava, rc_filename)) + def _recreate_uInitrd(session, target):