[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 679: Change sdmux to masterimage type to get bootloader commands working

Message ID 20130911144533.13998.14354.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Dave Pigott Sept. 11, 2013, 2:45 p.m.
Merge authors:
  Dave Pigott (dpigott)
Related merge proposals:
  https://code.launchpad.net/~dpigott/lava-dispatcher/change-sdmux-inheritance/+merge/185070
  proposed by: Dave Pigott (dpigott)
  review: Approve - Dave Pigott (dpigott)
------------------------------------------------------------
revno: 679 [merge]
committer: Dave Pigott <dave.pigott@linaro.org>
branch nick: trunk
timestamp: Wed 2013-09-11 15:45:02 +0100
message:
  Change sdmux to masterimage type to get bootloader commands working
modified:
  lava_dispatcher/device/sdmux.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

Patch

=== modified file 'lava_dispatcher/device/sdmux.py'
--- lava_dispatcher/device/sdmux.py	2013-09-05 09:51:15 +0000
+++ lava_dispatcher/device/sdmux.py	2013-09-11 14:43:05 +0000
@@ -30,8 +30,8 @@ 
 from lava_dispatcher.errors import (
     CriticalError,
 )
-from lava_dispatcher.device.target import (
-    Target
+from lava_dispatcher.device.master import (
+    MasterImageTarget
 )
 from lava_dispatcher.client.lmc_utils import (
     generate_android_image,
@@ -62,7 +62,7 @@ 
                 os.close(int(f))
 
 
-class SDMuxTarget(Target):
+class SDMuxTarget(MasterImageTarget):
     """
     This adds support for the "sd mux" device. An SD-MUX device is a piece of
     hardware that allows the host and target to both connect to the same SD
@@ -100,7 +100,7 @@ 
             with open('%s/etc/mkshrc' % d, 'a') as f:
                 f.write('\n# LAVA CUSTOMIZATIONS\n')
                 f.write('PS1="%s"\n' % self.ANDROID_TESTER_PS1)
-        self.deployment_data = Target.android_deployment_data
+        self.deployment_data = MasterImageTarget.android_deployment_data
 
     def deploy_android(self, boot, system, data):
         scratch = self.scratch_dir