diff options
-rw-r--r-- | meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py | 5 |
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): | |||
44 | def __init__(self, d): | 44 | def __init__(self, d): |
45 | super(EdgeRouterTarget, self).__init__(d) | 45 | super(EdgeRouterTarget, self).__init__(d) |
46 | 46 | ||
47 | self.image_fstype = self.get_image_fstype(d) | ||
47 | self.deploy_cmds = [ | 48 | self.deploy_cmds = [ |
48 | 'mount -L boot /boot', | 49 | 'mount -L boot /boot', |
49 | 'mkdir -p /mnt/testrootfs', | 50 | 'mkdir -p /mnt/testrootfs', |
50 | 'mount -L testrootfs /mnt/testrootfs', | 51 | 'mount -L testrootfs /mnt/testrootfs', |
51 | 'cp ~/test-kernel /boot', | 52 | 'cp ~/test-kernel /boot', |
52 | 'rm -rf /mnt/testrootfs/*', | 53 | 'rm -rf /mnt/testrootfs/*', |
53 | 'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs' | 54 | 'tar xvf ~/test-rootfs.%s -C /mnt/testrootfs' % self.image_fstype |
54 | ] | 55 | ] |
55 | if not self.serialcontrol_cmd: | 56 | if not self.serialcontrol_cmd: |
56 | bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.") | 57 | bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.") |
@@ -60,7 +61,7 @@ class EdgeRouterTarget(MasterImageHardwareTarget): | |||
60 | self.master.run("umount /mnt/testrootfs;") | 61 | self.master.run("umount /mnt/testrootfs;") |
61 | self.master.ignore_status = False | 62 | self.master.ignore_status = False |
62 | self.master.copy_to(self.kernel, "~/test-kernel") | 63 | self.master.copy_to(self.kernel, "~/test-kernel") |
63 | self.master.copy_to(self.rootfs, "~/test-rootfs.tar.gz") | 64 | self.master.copy_to(self.rootfs, "~/test-rootfs.%s" % self.image_fstype) |
64 | for cmd in self.deploy_cmds: | 65 | for cmd in self.deploy_cmds: |
65 | self.master.run(cmd) | 66 | self.master.run(cmd) |
66 | 67 | ||