From patchwork Tue Aug 28 05:06:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Doan X-Patchwork-Id: 10986 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 6241223F25 for ; Tue, 28 Aug 2012 05:06:14 +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 B73F6A18ED4 for ; Tue, 28 Aug 2012 05:05:45 +0000 (UTC) Received: by iafj25 with SMTP id j25so7170649iaf.11 for ; Mon, 27 Aug 2012 22:06:13 -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=rilXfwxyoYBivTZvGvyL13KzR3EUsAAOkJXGu+r19Dk=; b=lkhaIqS1bHXyeACThJe4nErBH11aqOVV4/aV+wD73H2C2QmCh3fNDkt0asRwS0xiFm /nvO5uW9O7LoNN31rTIWkgAezTj1EuRE1YjrPndTc79rsCkrwiRJNHwQStqCOc+stfWP HBcyRvpfZdbNcmFgVvEyDZ2hY5o+Q/De74YyLa5XVjCKr30OiNLhnHdZ5wD6Bn4Zg01l An/ufF3S83DeIGaX+E+Q3JHAwzQGc4Plq7LZC8L7m8MwWUSQVa+OBdoT6VuCMXvL1wN4 hsymeYHRLs8rbr9jAakSOd/ZSiOMPwAp3eTpEiOJgl8d69qDKkZlykrktloABPp92Vsv oMKQ== Received: by 10.50.217.227 with SMTP id pb3mr12438783igc.28.1346130373386; Mon, 27 Aug 2012 22:06: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 ex8csp7411igc; Mon, 27 Aug 2012 22:06:12 -0700 (PDT) Received: by 10.216.245.70 with SMTP id n48mr7505681wer.139.1346130372128; Mon, 27 Aug 2012 22:06:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id gz8si3844305wib.15.2012.08.27.22.06.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Aug 2012 22:06: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 1T6E0A-0003Xj-Mx for ; Tue, 28 Aug 2012 05:06:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 9F3D1E012D for ; Tue, 28 Aug 2012 05:06:10 +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: 375 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 375: support for boot testing an openembedded image Message-Id: <20120828050610.2681.37694.launchpad@ackee.canonical.com> Date: Tue, 28 Aug 2012 05:06: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="15864"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: c09ca7a98cca574ac1ab059ce615839a9d778d06 X-Gm-Message-State: ALoCoQkFkAVx/eb4KNOp2c/yldUqWtPzqF1NXkEwxY4H7pig+eOdQs1x6wM6VioRpwxQ3hIqWJh/ Merge authors: Andy Doan (doanac) Related merge proposals: https://code.launchpad.net/~doanac/lava-dispatcher/oe-boot-support/+merge/121460 proposed by: Andy Doan (doanac) ------------------------------------------------------------ revno: 375 [merge] committer: Andy Doan branch nick: lava-dispatcher timestamp: Mon 2012-08-27 23:57:27 -0500 message: support for boot testing an openembedded image modified: lava_dispatcher/client/master.py lava_dispatcher/default-config/lava-dispatcher/device-types/panda.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 'lava_dispatcher/client/master.py' --- lava_dispatcher/client/master.py 2012-08-01 17:52:55 +0000 +++ lava_dispatcher/client/master.py 2012-08-28 04:56:24 +0000 @@ -119,8 +119,9 @@ #DO NOT REMOVE - diverting flash-kernel and linking it to /bin/true #prevents a serious problem where packages getting installed that #call flash-kernel can update the kernel on the master image - session.run( - 'chroot /mnt/root dpkg-divert --local /usr/sbin/flash-kernel') + if session.run('chroot /mnt/root which dpkg-divert', failok=True) == 0: + session.run( + 'chroot /mnt/root dpkg-divert --local /usr/sbin/flash-kernel') session.run( 'chroot /mnt/root ln -sf /bin/true /usr/sbin/flash-kernel') session.run('umount /mnt/root') @@ -860,7 +861,17 @@ self.proc.sendline(interrupt_boot_command) def _boot_linaro_image(self): - self._boot(string_to_list(self.config.get('boot_cmds'))) + boot_cmds = 'boot_cmds' #default commands to boot ubuntu image + for option in self.boot_options: + keyval = option.split('=') + if len(keyval) != 2: + logging.warn("Invalid boot option format: %s" % option) + elif keyval[0] != 'boot_cmds': + logging.warn("Invalid boot option: %s" % keyval[0]) + else: + boot_cmds = keyval[1].strip() + + self._boot(string_to_list(self.config.get(boot_cmds))) def _boot_linaro_android_image(self): self._boot(string_to_list(self.config.get('boot_cmds_android'))) === modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf' --- lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf 2012-05-31 10:55:15 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf 2012-08-24 19:35:21 +0000 @@ -17,4 +17,14 @@ init=/init androidboot.console=ttyO2'", boot +boot_cmds_oe = mmc init, + mmc part 0, + setenv initrd_high "0xffffffff", + setenv fdt_high "0xffffffff", + setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; bootm 0x80200000'", + setenv bootargs "' console=tty0 console=ttyO2,115200n8 + root=/dev/mmcblk0p5 rootwait ro earlyprintk fixrtc nocompcache + vram=48M omapfb.vram=0:24M'", + boot + android_binary_drivers = http://192.168.1.21/LAVA_HTTP/android-binaries/panda-drivers.tgz