From patchwork Thu May 2 22:00:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Terceiro X-Patchwork-Id: 16606 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9569C238EC for ; Thu, 2 May 2013 22:00:35 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id q16sf1726618vbe.11 for ; Thu, 02 May 2013 15:00:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :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=jnjqlvj7tcp5IneUOPAGUc+PZwwQMd9eRsVk+SCCrBc=; b=BHDglyD0OQegUw7rfDWznCdooIjC5KJ1SLCPX0TxJ3dkBfJA5ieZLCu/FIDZYOcrFi tT/PZ2IaF3vTlBvUIW41CVRaqmnKGTlh5BAmSd0NHG9sge32FFyTbnoEv0WpQjMOl/9V s4LZotiTKe4Vfp7fA2M9ozqo9iTzMvcj1zN1zT2etz3TAykjiQ3zMSMvgdKGpztFxc/P 0ujUMBQ1FWKATdbVLx6t8UzSq61zXJKMrplng7ehu/JXWTUawMShRG/PlHpPD8P9y2I5 FjYmPmIPidmvtALS9KhEAdedrq975jndmfs/31gt8PZ7cSqSwSzT4sfktWnxyGVp5s2Z i2Ow== X-Received: by 10.236.151.133 with SMTP id b5mr561581yhk.49.1367532026904; Thu, 02 May 2013 15:00:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.98.166 with SMTP id ej6ls1621787qeb.37.gmail; Thu, 02 May 2013 15:00:26 -0700 (PDT) X-Received: by 10.52.0.130 with SMTP id 2mr2366414vde.97.1367532026636; Thu, 02 May 2013 15:00:26 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id wl5si3809408vec.16.2013.05.02.15.00.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 02 May 2013 15:00:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id ia10so962791vcb.41 for ; Thu, 02 May 2013 15:00:26 -0700 (PDT) X-Received: by 10.221.0.199 with SMTP id nn7mr2891812vcb.14.1367532026520; Thu, 02 May 2013 15:00:26 -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.58.127.98 with SMTP id nf2csp221993veb; Thu, 2 May 2013 15:00:25 -0700 (PDT) X-Received: by 10.180.183.197 with SMTP id eo5mr10173493wic.28.1367532024863; Thu, 02 May 2013 15:00:24 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id r19si2587528wju.183.2013.05.02.15.00.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 15:00:24 -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 1UY1Y8-0008SU-6O for ; Thu, 02 May 2013 22:00:24 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 1EFC9E027E for ; Thu, 2 May 2013 22:00:24 +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: 593 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 593: Improvements on reading boot commands from image + vexpress fix Message-Id: <20130502220024.4538.91580.launchpad@ackee.canonical.com> Date: Thu, 02 May 2013 22:00:24 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16598"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: aec4d552aa03785558c706c6ffd0df4980e37020 X-Gm-Message-State: ALoCoQlrQgWMGEbpIpsna+0EZeAqfLkkOlmFvgVWGjuj6N1SH25c9RXoC2iac91kPQr2DbhSNR4z X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 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: Antonio Terceiro (terceiro) Related merge proposals: https://code.launchpad.net/~terceiro/lava-dispatcher/optional-boot-commands-from-image/+merge/162257 proposed by: Antonio Terceiro (terceiro) review: Approve - Tyler Baker (tyler-baker) ------------------------------------------------------------ revno: 593 [merge] committer: Antonio Terceiro branch nick: trunk timestamp: Thu 2013-05-02 18:59:11 -0300 message: Improvements on reading boot commands from image + vexpress fix modified: lava_dispatcher/config.py 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-04-29 10:31:06 +0000 +++ lava_dispatcher/config.py 2013-05-02 21:43:14 +0000 @@ -32,6 +32,7 @@ boot_cmds = schema.StringOption(fatal=True) # Can do better here boot_cmds_android = schema.StringOption(fatal=True) # And here boot_cmds_oe = schema.StringOption(fatal=True) # And here? + read_boot_cmds_from_image = schema.BoolOption(default=True) boot_options = schema.ListOption() boot_linaro_timeout = schema.IntOption(default=300) boot_part = schema.IntOption(fatal=True) === 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-02-27 21:10:47 +0000 +++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf 2013-05-02 21:43:14 +0000 @@ -25,3 +25,5 @@ vexpress_uefi_backup_path = SOFTWARE/TC2/backup-uefi.bin vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD + +read_boot_cmds_from_image = 0 === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2013-04-30 11:45:15 +0000 +++ lava_dispatcher/device/master.py 2013-05-02 21:43:14 +0000 @@ -204,6 +204,9 @@ def _read_boot_cmds(self, image=None, boot_tgz=None): boot_file_path = None + if not self.config.read_boot_cmds_from_image: + return + # If we have already obtained boot commands dynamically, then return. if self.deployment_data.get('boot_cmds_dynamic', False): logging.debug("We already have boot commands in place.") @@ -480,17 +483,22 @@ def _boot_linaro_image(self): boot_cmds = self.deployment_data['boot_cmds'] + boot_cmds_override = False options = boot_options.as_dict(self, defaults={'boot_cmds': boot_cmds}) if 'boot_cmds' in options: + boot_cmds_override = True boot_cmds = options['boot_cmds'].value logging.info('boot_cmds attribute: %s', boot_cmds) # Check if we have already got some values from image's boot file. - if self.deployment_data.get('boot_cmds_dynamic'): + if self.deployment_data.get('boot_cmds_dynamic') \ + and not boot_cmds_override: + logging.info('Loading boot_cmds from image') boot_cmds = self.deployment_data['boot_cmds_dynamic'] else: + logging.info('Loading boot_cmds from device configuration') boot_cmds = self.config.cp.get('__main__', boot_cmds) boot_cmds = string_to_list(boot_cmds.encode('ascii'))