aboutsummaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp/lib/oeqa/controllers
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-06 21:24:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 11:45:16 +0100
commit55c85889811c769aa841bd74b43294e1f982368f (patch)
tree79cdf179bb5106a0f662e83bb88ce750e2179a1e /meta-yocto-bsp/lib/oeqa/controllers
parent1655fe2eae631ab81355222ad0207dab2b47ba86 (diff)
downloadpoky-55c85889811c769aa841bd74b43294e1f982368f.tar.gz
poky-55c85889811c769aa841bd74b43294e1f982368f.tar.bz2
poky-55c85889811c769aa841bd74b43294e1f982368f.zip
controllers/edgeroutertarget.py: enable dynamical determination of rootfs type
[YOCTO #6375] (From meta-yocto rev: 375ab07adf29e94ae09b7c087dec4ca1443babfc) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp/lib/oeqa/controllers')
-rw-r--r--meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
index 5df9fda09e..b3338ca859 100644
--- a/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
+++ b/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
@@ -44,13 +44,14 @@ class EdgeRouterTarget(MasterImageHardwareTarget):
def __init__(self, d):
super(EdgeRouterTarget, self).__init__(d)
+ self.image_fstype = self.get_image_fstype(d)
self.deploy_cmds = [
'mount -L boot /boot',
'mkdir -p /mnt/testrootfs',
'mount -L testrootfs /mnt/testrootfs',
'cp ~/test-kernel /boot',
'rm -rf /mnt/testrootfs/*',
- 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs'
+ 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype
]
if not self.serialcontrol_cmd:
bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.")
@@ -60,7 +61,7 @@ class EdgeRouterTarget(MasterImageHardwareTarget):
self.master.run("umount /mnt/testrootfs;")
self.master.ignore_status = False
self.master.copy_to(self.kernel, "~/test-kernel")
- self.master.copy_to(self.rootfs, "~/test-rootfs.tar.gz")
+ self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype)
for cmd in self.deploy_cmds:
self.master.run(cmd)