From patchwork Tue Mar 13 01:50:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 7250 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 AC52923DEA for ; Tue, 13 Mar 2012 01:50:16 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 521D8A182A6 for ; Tue, 13 Mar 2012 01:50:16 +0000 (UTC) Received: by iage36 with SMTP id e36so91832iag.11 for ; Mon, 12 Mar 2012 18:50:15 -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=wAazS714bmDxXZDqU0gsB1gGcZbn9MIAoZFpeVVAUcM=; b=Qk7I90L37poE+3dRJoii7xJkUNpEdwUD9z30LKGCPa3FdwU4LwwpewnLBI7PICl0mN xAtQtW4xGn4tTdw67MfkNoFtFWyETjBIpVYjRFHq/w8cWmKV58mbP0uxC2rpBfv/594g 1v+NEY3jCUDKmiyCSH3dRwaM4a2Oc0sOw3oSEVtu49I9datfK4p+Lp0otjnrjyDnpwKK VhEsykQKDbyc49a3EdUNKIKWSB1prU3fUVD7wOO3cMDYWGhiQ6I0s5a5XNAz3B4QX7CD VRt6LYPnX9JgMaHkt9p+rHo38BX68BF4IzW/dcYAcrWw35ofgh4WbU6lQbcQG6Qb9EmM 0DeQ== Received: by 10.50.222.233 with SMTP id qp9mr1464793igc.58.1331603415680; Mon, 12 Mar 2012 18:50:15 -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.231.53.18 with SMTP id k18csp55274ibg; Mon, 12 Mar 2012 18:50:15 -0700 (PDT) Received: by 10.180.86.230 with SMTP id s6mr2793218wiz.16.1331603414385; Mon, 12 Mar 2012 18:50:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id s79si20158545weq.84.2012.03.12.18.50.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Mar 2012 18:50:14 -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 1S7GsP-000308-Rh for ; Tue, 13 Mar 2012 01:50:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C635BE017C for ; Tue, 13 Mar 2012 01:50:13 +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: 250 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 250: Support for booting Versatile Express via UEFI Message-Id: <20120313015013.15889.25699.launchpad@ackee.canonical.com> Date: Tue, 13 Mar 2012 01:50:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14933"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 9928d7fbf073fc0240e6f2fbdc74977153dc7d3a X-Gm-Message-State: ALoCoQko/13hmkInRVzhUCvA5RCIs85MXearY7BYFL5llAnKtnH+SRj4gkEt+91zbuDSBd1evXzp Merge authors: Dave Pigott (dpigott) Related merge proposals: https://code.launchpad.net/~dpigott/lava-dispatcher/add-vexpress/+merge/97030 proposed by: Dave Pigott (dpigott) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 250 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Tue 2012-03-13 14:48:14 +1300 message: Support for booting Versatile Express via UEFI added: doc/scripts/ doc/scripts/lava-partition-disk lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress.conf modified: doc/changes.rst lava_dispatcher/client/master.py lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf --- 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 'doc/changes.rst' --- doc/changes.rst 2012-03-13 01:41:23 +0000 +++ doc/changes.rst 2012-03-13 01:48:14 +0000 @@ -5,7 +5,12 @@ Version 0.5.8 (UNRELEASED) ========================== - +* Changes for virtual express support: + * Add in a standard vexpress config for UEFI + * Make changes to allow for different boot interception message + configuration + * Increase timeouts for some stages of deployment (mkfs ext3) to + account for vexpress (lack of) speed. .. _version_0_5_7: === added directory 'doc/scripts' === added file 'doc/scripts/lava-partition-disk' --- doc/scripts/lava-partition-disk 1970-01-01 00:00:00 +0000 +++ doc/scripts/lava-partition-disk 2012-03-07 10:39:25 +0000 @@ -0,0 +1,64 @@ +#!/bin/bash + +if [ "$1" = "" ] +then + DEVICE="/dev/sdb" +else + DEVICE=$1 +fi + +if [ "$2" = "" ] +then +# SIZE is the size of the testrootfs partition. On an 8G sd you can fit +# 4G - put it up to 8G on a 16GB. The rest is allocated to sdcard for +# android + SIZE="4G" +else + SIZE=$2 +fi + +if [ "$3" = "" ] +then + SCHEME="2part" +else + SCHEME=$3 +fi + +# origen has a different original layout with 3 partitions - all others are the same (so far) + +if [ $SCHEME = "2part" ] +then + TESTBOOT_PART=3 + TESTROOTFS_PART=5 + SDCARD_PART=6 + LAST_BLOCK=2 +else + TESTBOOT_PART=5 + TESTROOTFS_PART=6 + SDCARD_PART=7 + LAST_BLOCK=3 +fi + +FIRST_BLOCK_START=`sudo fdisk -S 63 -H 255 -lc $DEVICE | grep "$DEVICE$LAST_BLOCK" | awk '{print $3 + 1}'` + +if [ "$FIRST_BLOCK_START" = "" ] +then + echo "Device specification error: $DEVICE" + exit 1 +fi + +if [ $SCHEME = "2part" ] +then + EXTENDED_BLOCK_START=`echo $FIRST_BLOCK_START | awk '{print $1 + 131072}'` + FDISK_SCRIPT="n\np\n3\n$FIRST_BLOCK_START\n+64M\nt\n3\nc\nn\ne\n$EXTENDED_BLOCK_START\n\nn\n\n+$SIZE\nn\n\n\nt\n6\nc\np\nw\n" +else + FDISK_SCRIPT="n\ne\n$FIRST_BLOCK_START\n\nn\n\n+64M\nt\n5\nc\nn\n\n+$SIZE\nn\n\n\nt\n7\nc\np\nw\n" +fi + +echo -e $FDISK_SCRIPT | sudo fdisk -S 63 -H 255 -c $DEVICE + +sudo partprobe $DEVICE +sudo mkfs.vfat -n testboot "$DEVICE$TESTBOOT_PART" +sudo mkfs.vfat -n sdcard "$DEVICE$SDCARD_PART" +sudo mkfs.ext3 -L testrootfs "$DEVICE$TESTROOTFS_PART" +sync === modified file 'lava_dispatcher/client/master.py' --- lava_dispatcher/client/master.py 2012-03-08 21:31:03 +0000 +++ lava_dispatcher/client/master.py 2012-03-13 01:48:14 +0000 @@ -175,7 +175,7 @@ session.run('umount /dev/disk/by-label/testrootfs', failok=True) session.run( - 'mkfs -t %s -q /dev/disk/by-label/testrootfs -L testrootfs' % rootfstype) + 'mkfs -t %s -q /dev/disk/by-label/testrootfs -L testrootfs' % rootfstype, timeout=1800) session.run('udevadm trigger') session.run('mkdir -p /mnt/lava/system') session.run( @@ -448,7 +448,7 @@ logging.info("Boot the system master image") self.soft_reboot() try: - self.proc.expect("Starting kernel") + self.proc.expect("Uncompressing Linux") self._in_master_shell(300) except: logging.exception("in_master_shell failed") @@ -463,7 +463,7 @@ session.run('umount /dev/disk/by-label/testrootfs', failok=True) session.run( 'mkfs -t %s -q /dev/disk/by-label/testrootfs -L testrootfs' - % fstype) + % fstype, timeout=1800) session.run('umount /dev/disk/by-label/testboot', failok=True) session.run('mkfs.vfat /dev/disk/by-label/testboot -n testboot') @@ -639,7 +639,8 @@ self.proc.sendline("hardreset") def _enter_uboot(self): - self.proc.expect("Hit any key to stop autoboot") + interrupt_boot_prompt = self.device_option('interrupt_boot_prompt') + self.proc.expect(interrupt_boot_prompt) self.proc.sendline("") def _boot_linaro_image(self): === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-01-18 16:46:35 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf 2012-03-06 09:02:09 +0000 @@ -82,6 +82,9 @@ # Test image recognization string TESTER_STR = root@linaro +# The string to look for to interrupt the boot process +interrupt_boot_prompt = Hit any key to stop autoboot + # The character the boot loader uses as a prompt on this board. bootloader_prompt = # === added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress.conf 1970-01-01 00:00:00 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress.conf 2012-03-06 09:02:09 +0000 @@ -0,0 +1,7 @@ +boot_cmds = 2 + +boot_cmds_android = 3 + +interrupt_boot_prompt = The default boot selection will start in + +bootloader_prompt = Start: